gitlab-org--gitlab-foss/app/services
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
..
application_settings
applications
auth
badges
boards
chat_names
ci
clusters
commits
concerns
deploy_keys
deploy_tokens
discussions
emails
error_tracking
events
files
gpg_keys
groups
import
issuable
issues
keys
labels
lfs
mattermost
members
merge_requests Show pre-receive error message in merge request widget 2019-03-02 06:31:09 -08:00
milestones
notes
projects
prometheus
protected_branches
protected_tags
quick_actions
releases
resource_events
search
submodules
suggestions
tags
test_hooks
todos/destroy
users
wiki_pages
wikis
access_token_validation_service.rb
after_branch_delete_service.rb
akismet_service.rb
audit_event_service.rb
base_count_service.rb
base_renderer.rb
base_service.rb
cohorts_service.rb
compare_service.rb
create_branch_service.rb
create_snippet_service.rb
delete_branch_service.rb
delete_merged_branches_service.rb
event_create_service.rb
git_push_service.rb
git_tag_push_service.rb
gravatar_service.rb
ham_service.rb
import_export_clean_up_service.rb
issuable_base_service.rb
merge_request_metrics_service.rb
metrics_service.rb
note_summary.rb
notification_recipient_service.rb
notification_service.rb
preview_markdown_service.rb
push_event_payload_service.rb
repair_ldap_blocked_user_service.rb
repository_archive_clean_up_service.rb
reset_project_cache_service.rb
search_service.rb
spam_check_service.rb
spam_service.rb
submit_usage_ping_service.rb
system_hooks_service.rb
system_note_service.rb
task_list_toggle_service.rb
todo_service.rb
update_deployment_service.rb
update_snippet_service.rb
upload_service.rb
user_agent_detail_service.rb
user_project_access_changed_service.rb
validate_new_branch_service.rb
verify_pages_domain_service.rb
web_hook_service.rb