Stan Hu b6a9727870 Show pre-receive error message in merge request widget ... When a merge fails due to a locked file, no feedback was given to the user as to why it failed if the user used the Merge button. However, if the push attempt happened directly in the Web UI, the pre-receive message would be displayed. To be consistent and to make it clear why a merge failed, we now include the pre-receive error message in the merge request widget. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/10165		2019-03-02 06:31:09 -08:00
..
conflicts	Enable more frozen string in app/services/**/*.rb	2018-07-17 15:19:40 -07:00
add_todo_when_build_fails_service.rb	Enable more frozen string in app/services/**/*.rb	2018-07-17 15:19:40 -07:00
assign_issues_service.rb	Enable more frozen string in app/services/**/*.rb	2018-07-17 15:19:40 -07:00
base_service.rb	Add suffix for merge request event	2019-03-01 22:52:38 +09:00
build_service.rb	Validate projects in MR build service	2018-12-14 10:21:09 +01:00
close_service.rb	Enable more frozen string in app/services/**/*.rb	2018-07-17 15:19:40 -07:00
create_from_issue_service.rb	Creates /create_merge_request quickaction	2018-11-14 15:16:19 +01:00
create_service.rb	Refactor the logic of updating head pipelines	2019-01-04 19:36:45 +09:00
delete_non_latest_diffs_service.rb	Disable existing offenses for the CodeReuse cops	2018-09-11 17:32:00 +02:00
ff_merge_service.rb	Enable more frozen string in app/services/**/*.rb	2018-07-17 15:19:40 -07:00
get_urls_service.rb	Revert "Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'master'"	2018-11-07 13:32:20 +00:00
merge_base_service.rb	Move error check to pvt	2019-02-25 10:41:03 -03:00
merge_service.rb	Show pre-receive error message in merge request widget	2019-03-02 06:31:09 -08:00
merge_to_ref_service.rb	Extend error checking to be overwritten in EE	2019-02-25 10:41:02 -03:00
merge_when_pipeline_succeeds_service.rb	Enable more frozen string in app/services/**/*.rb	2018-07-17 15:19:40 -07:00
post_merge_service.rb	Retrieve merge request closing issues from database cache	2018-08-06 11:58:22 -03:00
rebase_service.rb	Enable more frozen string in app/services/**/*.rb	2018-07-17 15:19:40 -07:00
refresh_service.rb	Guard with feature flag	2018-12-07 21:00:47 +08:00
reload_diffs_service.rb	Comment on any expanded diff line on MRs	2018-11-09 16:56:48 -02:00
reopen_service.rb	Retrieve merge request closing issues from database cache	2018-08-06 11:58:22 -03:00
resolved_discussion_notification_service.rb	Enable more frozen string in app/services/**/*.rb	2018-07-17 15:19:40 -07:00
squash_service.rb	Allow custom squash commit messages	2019-02-06 12:33:11 +00:00
update_service.rb	Enable fast task lists for merge requests	2019-02-07 09:28:35 -06:00
working_copy_base_service.rb	Enable more frozen string in app/services/**/*.rb	2018-07-17 15:19:40 -07:00