Douwe MaanandRobert Speicher fb3c685fdd Merge branch 'fix-commits-manual-merge' into 'master' ...

Fix bug where manually merged branches in a MR would end up with an empty diff

This bug manifested in 8.1 with the refactoring of `RefreshService`. Here's what happens:

1. User create a new branch `foo`.
2. User creates a merge request for `foo`.
3. User merges `foo` into `master` by hand.
4. `RefreshService` reloads the merge request. Since `master` is equivalent to `foo`, this results in an empty diff.
5. `RefreshService` then closes the MR.

This wasn't an issue when you use the normal "Accept Merge Request" flow because the act of clicking the button closes the merge request, so step 4 never happens.

Closes #3314

See merge request !1758

2015-11-09 12:26:54 -05:00

..

benchmarks

Merge branch 'user-by-login-performance' into 'master'

2015-10-15 13:41:17 +00:00

controllers

Merge branch 'project-path-case-sensitivity' into 'master'

2015-10-22 15:05:54 +02:00

factories

Implement Commit Status API

2015-10-12 11:53:49 +02:00

features

Merge branch 'rs-redactor-filter' into 'master'

2015-10-17 13:57:22 +02:00

finders

Merge remote-tracking branch 'public/trending-projects-performance'

2015-10-08 16:22:43 +02:00

fixtures

No HTML-only email please

2015-08-21 16:09:55 -07:00

helpers

Merge branch 'cross-reference-mr-on-issues' into 'master'

2015-10-19 12:10:19 +02:00

javascripts

Apply new design to files page

2015-10-13 16:41:48 +02:00

lib

Merge branch 'fix-wiki-clone-over-http' into 'master'

2015-10-23 13:32:48 +02:00

mailers

Merge branch 'stanhu/gitlab-ce-fix-message-id-notify'

2015-10-01 16:28:10 +02:00

models

Merge branch 'cross-reference-mr-on-issues' into 'master'

2015-10-19 12:10:19 +02:00

requests

Merge branch 'stanhu/gitlab-ce-fix-api-mr-comment-notifications'

2015-10-15 15:56:43 +02:00

routing

Move partial to right place and fix tests.

2015-09-08 15:14:14 +01:00

services

Merge branch 'fix-commits-manual-merge' into 'master'

2015-11-09 12:26:54 -05:00

support

Merge branch 'rs-redactor-filter' into 'master'

2015-10-17 13:57:22 +02:00

tasks/gitlab

Fix rubocop warnings in spec/lib and spec/tasks

2015-10-03 16:02:21 -05:00

views/help

Allow non-admin users to see version information

2015-09-23 17:18:15 -04:00

workers

Remove RepositoryArchiveWorker specs

2015-10-14 12:19:02 +02:00

factories_spec.rb

Remove the invalid key factories

2015-04-11 17:12:10 -04:00

factories.rb

Only publish ssh key-type and key

2015-08-04 14:33:18 +02:00

rails_helper.rb

Started on the actual rspec 3 upgrade

2015-06-22 12:12:49 +02:00

spec_helper.rb

Merge branch 'refactor-build-service' into 'master'

2015-10-05 17:42:50 +00:00

teaspoon_env.rb

teaspoon install

2015-05-28 18:22:32 -04:00