Douwe Maan 03b12ee550 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 11:12:42 +00:00

..

benchmarks

Merge branch 'create-project-performance' into 'master'

2015-11-04 10:14:30 +00:00

controllers

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

2015-10-22 13:03:04 +00:00

factories

Fix tests

2015-11-08 23:55:47 +01:00

features

CI details cleanup

2015-11-05 15:24:27 +01:00

finders

Allow groups to appear in the search results if the group owner allows it

2015-11-05 13:18:51 +02:00

fixtures

No HTML-only email please

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

helpers

Allow groups to appear in the search results if the group owner allows it

2015-11-05 13:18:51 +02:00

javascripts

Apply new design to files page

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

lib

Merge branch 'web_hook_repo_changes'

2015-11-03 15:05:50 +02:00

mailers

Fix code that depends on incorrect inflector behavior

2015-11-03 12:00:27 +01:00

models

Fix tests

2015-11-08 23:55:47 +01:00

requests

Replace all usages of git command with configurable binary path

2015-11-03 17:11:09 -05: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 11:12:42 +00:00

support

Replace all usages of git command with configurable binary path

2015-11-03 17:11:09 -05:00

tasks/gitlab

One more backup spec fix

2015-10-06 16:11:59 +02:00

views/help

Allow non-admin users to see version information

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

workers

Cleanup stuck CI builds daily

2015-11-03 13:12:16 +01: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