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

..

ci

Merge branch 'fix-ci-badge' into 'master'

2015-10-26 15:04:27 +01:00

files

Add directory feature button

2015-10-07 04:22:55 -07:00

issues

Use issue editor as cross reference comment author when issue is edited with a new mention.

2015-11-04 10:36:06 -05:00

labels

Merge branch 'filter-label' into 'master'

2015-10-16 17:31:38 -04:00

merge_requests

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

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

milestones

Remove milestones from merge requests when milestones are deleted

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

notes

Use issue editor as cross reference comment author when issue is edited with a new mention.

2015-11-04 10:36:06 -05:00

oauth2

Rubocop: no trailing newlines

2015-02-02 21:53:27 -08:00

projects

Fix: Images cannot show when projects' path was changed

2015-10-14 18:50:35 +03:00

search

An in_namespace scope is already present

2015-06-09 13:42:01 +02:00

archive_repository_service.rb

Merge branch 'git-archive-improvements-2' into 'master'

2015-10-21 10:19:07 +02:00

audit_event_service.rb

Audit log for user authentication

2015-07-06 12:36:08 +03:00

base_service.rb

Revert "Merge branch 'revert-satellites' into 'master' "

2015-08-11 14:33:31 +02:00

compare_service.rb

Fix Error 500 when comparing non-existing branches

2015-09-18 12:02:01 -07:00

create_branch_service.rb

Ecevute hooks and services when branches are created/deleted through web.

2015-03-13 16:07:02 +01:00

create_snippet_service.rb

Enforce restricted visibilities for snippets

2015-03-08 17:57:08 -06:00

create_tag_service.rb

Use project.commit convenience method.

2015-04-24 12:29:36 +02:00

delete_branch_service.rb

Ecevute hooks and services when branches are created/deleted through web.

2015-03-13 16:07:02 +01:00

delete_tag_service.rb

Move tag deletion to service and execute hooks and services.

2015-03-13 16:07:08 +01:00

delete_user_service.rb

Fix error when deleting a user who has projects

2015-06-23 04:39:49 -07:00

destroy_group_service.rb

Skip repo removing whem remove user or group

2015-06-03 16:16:27 +02:00

event_create_service.rb

Create a "destroyed Milestone" event and keep Milestone events around in the DB

2015-09-15 05:51:11 -07:00

git_push_service.rb

Merge branch 'hash-block-return' into 'master'

2015-10-19 11:19:26 +02:00

git_tag_push_service.rb

Build missing cache items in background job after each push

2015-07-17 14:50:03 +02:00

gravatar_service.rb

Improve application settings and write tests

2015-01-08 09:53:35 -08:00

issuable_base_service.rb

Dynamically check :admin_* ability in IssuableBaseService

2015-07-24 15:50:12 -04:00

notification_service.rb

Note the original location of a moved project when notifying users of the move

2015-10-01 09:54:56 +03:00

system_hooks_service.rb

hooks: Add full project namespace to payload

2015-10-02 19:44:33 +02:00

system_note_service.rb

Merge branch 'dm-issue-3140' into 'master'

2015-10-22 09:16:28 +02:00

test_hook_service.rb

Added X-GitLab-Event header for web hooks

2015-05-08 16:49:03 +03:00

update_snippet_service.rb

Change dynamic abilities to new format

2015-06-26 17:18:40 +02:00