Dmitriy Zaporozhets 15281bdd26 Merge branch 'ff-merge' into 'master' ...

Fast-forward merge button

For #337, #338 

- [x] fast-forward merge option in project settings
- [x] fast-forward merge button
- [x] message if ff is not possible
- [x] rebase button if ff is not possible and rebase is enabled
- [x] rebase button depends on ff-only setting
- [x] remove `rebase enabled by default` checkbox from project settings
- [x] implement rebase feature
- [x] write tests
- [x] update CHANGELOG and documentation
- [x] mention in 8.0 blog post

See merge request !485

2015-09-10 10:01:49 +00:00

..

abuse_reports

Improve abuse report wording

2015-08-08 19:46:34 +02:00

admin

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-08-26 17:15:12 +02:00

audit_events

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee

2015-05-05 10:18:27 +02:00

dashboard

Increase width of sidebar for several pages

2015-08-26 10:36:08 +02:00

devise

Fix sign in form when just Kerberos is enabled

2015-08-21 16:51:45 -07:00

doorkeeper

Correctly show anonymous authorized applications under Profile > Applications.

2015-07-02 11:53:31 +02:00

email_rejection_mailer

We'll get the <p> for free.

2015-08-19 12:38:08 -07:00

errors

Add a page title to every page.

2015-04-30 19:12:15 +02:00

events

Fix tests and last push widget

2015-08-25 16:36:54 +02:00

explore

Re-use project partial for rendering explore projects

2015-08-25 18:20:06 +02:00

groups

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-08-26 17:15:12 +02:00

help

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-07-14 15:40:46 +02:00

import

Merge master from CE

2015-08-17 14:01:32 +02:00

invites

Add a page title to every page.

2015-04-30 19:12:15 +02:00

kaminari/gitlab

Migrate forms and inputs pt1

2013-12-31 02:50:36 +02:00

layouts

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-08-26 17:15:12 +02:00

ldap_group_links

Improve UI for sharing project with groups and LDAP groups pages

2015-03-18 19:49:24 -07:00

notify

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-06-05 11:40:36 +02:00

profiles

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-08-26 17:15:12 +02:00

projects

Merge branch 'ff-merge' into 'master'

2015-09-10 10:01:49 +00:00

search

Ability to search milestones

2015-08-24 13:59:01 +03:00

shared

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-08-26 17:15:12 +02:00

snippets

Small ui improvements to snippet page

2015-08-20 12:56:15 +02:00

unsubscribes

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee

2015-05-05 10:18:27 +02:00

users

Increase width of sidebar for several pages

2015-08-26 10:36:08 +02:00

votes

Fix votes inline rendering

2015-03-20 15:34:29 -07:00