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

..

assets

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

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

controllers

Move rebase to async worker

2015-09-03 12:26:56 +02:00

finders

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

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

helpers

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

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

mailers

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

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

models

Detect rebase state based on rebase directory

2015-09-07 09:19:16 +02:00

services

Skip rebase if another in progress

2015-09-07 21:14:06 +02:00

uploaders

Fix URL to uploaded file.

2015-02-20 16:01:37 +01:00

views

Merge branch 'ff-merge' into 'master'

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

workers

Move rebase to async worker

2015-09-03 12:26:56 +02:00