gitlab-org--gitlab-foss/app/services/merge_requests
Grzegorz Bizon 797af06491 Merge branch 'master' into feature/issue-move
* master:
  Fix bug where wrong commit ID was being used in a merge request diff to show old image
  Remove CHANGELOG item that was added during merge resolution
  Improve the "easy WIP & un-WIP from link" feature
  Fix specs
  \#to_branch_name now uses the iid as postfix
  Add label description in tooltip to labels in issue index and sidebar
  Easily (un)mark merge request as WIP using link
  Use specialized system notes when MR is (un)marked as WIP
  another attempt to fix oauth issue
  attempting to fix omniauth problem

Conflicts:
	app/assets/javascripts/issuable_form.js.coffee
2016-03-20 11:01:08 +01:00
..
base_service.rb Improve the "easy WIP & un-WIP from link" feature 2016-03-18 23:27:35 +01:00
build_service.rb \#to_branch_name now uses the iid as postfix 2016-03-18 19:34:04 +01:00
close_service.rb Rename Tasks to Todos 2016-02-20 12:39:27 -02:00
create_service.rb Rename Tasks to Todos 2016-02-20 12:39:27 -02:00
merge_service.rb Save merge commit id when MR is merged 2016-02-19 13:14:49 -05:00
merge_when_build_succeeds_service.rb Check the HEAD of branch when doing Merge When Succeeded 2016-02-22 10:34:09 +01:00
post_merge_service.rb Update methods that use issue close service 2016-03-17 09:54:16 +01:00
refresh_service.rb Fixed Rubocop offenses 2015-12-15 00:53:52 -02:00
reopen_service.rb Organize event order execution when update issue or mr 2015-01-25 22:49:05 -08:00
update_service.rb Improving the original label-subscribing implementation 2016-03-15 18:22:02 +01:00