gitlab-org--gitlab-foss/app
Robert Speicher 2b1ddb0f80 Merge branch 'mr-merge-base' into 'master'
Correctly determine MR diff base when MR has merge conflicts

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12779

See merge request !2632
2016-01-28 21:08:41 +00:00
..
assets Merge branch 'issue_2406' into 'master' 2016-01-28 16:58:38 +00:00
controllers Merge branch 'mr-merge-base' into 'master' 2016-01-28 21:08:41 +00:00
finders Scope issue projects to a Group when possible 2016-01-18 12:27:33 +01:00
helpers Merge branch 'issue_2406' into 'master' 2016-01-28 16:58:38 +00:00
mailers Added X-GitLab-... headers to emails from CI and Email On Push services 2016-01-19 20:18:39 +02:00
models Merge branch 'mr-merge-base' into 'master' 2016-01-28 21:08:41 +00:00
services Move Gitlab::BitbucketImport::KeyDeleter to it's own importer 2016-01-26 10:56:22 -02:00
uploaders Let the CI runner know about builds that this build depends on 2016-01-14 19:45:55 +01:00
validators Blacklist 'new' 2016-01-08 10:19:22 +01:00
views Merge branch 'highlight-blame' into 'master' 2016-01-28 20:30:21 +00:00
workers Extract Projects::ImportService service from RepositoryImportWorker 2016-01-25 22:58:30 -02:00