kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/app/services
History
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 Ask user explicitly about usage stats agreement 2018-09-07 14:32:28 +00:00
applications Reduce remaining diff with EE in app/services 2019-02-14 12:37:55 +01:00
auth Update comment about legacy pipeline triggers 2019-02-07 16:33:13 +02:00
badges Enable frozen string in apps/services/**/*.rb 2018-07-16 12:36:41 -07:00
boards CE-port for 7714-view-recent-boards 2019-03-01 19:47:52 +08:00
chat_names Disable existing offenses for the CodeReuse cops 2018-09-11 17:32:00 +02:00
ci Persist source sha and target sha for merge pipelines 2019-02-27 17:12:04 +09:00
clusters Get rid of ScheduleInstallationService 2019-02-26 16:44:31 +00:00
commits Fix misspellings in app/spec executable lines 2019-02-27 22:41:34 +09:00
concerns Add type property to project autocomplete members 2019-02-18 16:58:28 +00:00
deploy_keys Make Projects::DeployKeysController EE-ready 2018-12-19 18:02:01 +01:00
deploy_tokens Enable frozen string in apps/services/**/*.rb 2018-07-16 12:36:41 -07:00
discussions Enable frozen string in apps/services/**/*.rb 2018-07-16 12:36:41 -07:00
emails Reduce remaining diff with EE in app/services 2019-02-14 12:37:55 +01:00
error_tracking Refactor model and spec 2019-03-01 14:51:54 +00:00
events Enable frozen string in apps/services/**/*.rb 2018-07-16 12:36:41 -07:00
files Commits API: Preserve file content in move operations if unspecified 2018-11-28 11:50:05 +00:00
gpg_keys Enable frozen string in apps/services/**/*.rb 2018-07-16 12:36:41 -07:00
groups Merge branch 'fix-misspellings-app-comments' into 'master' 2019-02-26 12:25:01 +01:00
import API for importing external repos 2019-01-17 10:37:08 +00:00
issuable Refactor toggling of task list item 2019-01-30 23:18:16 +01:00
issues Reduce remaining diff with EE in app/services 2019-02-14 12:37:55 +01:00
keys Fix typos in comments and specs 2018-11-01 08:59:20 +02:00
labels Incorporate feedback from Nick 2019-01-31 13:49:50 +01:00
lfs Fix several ActionController::Parameters deprecations 2019-01-11 21:19:01 +01:00
mattermost Enable more frozen string in app/services/**/*.rb 2018-07-17 15:19:40 -07:00
members Update members service to cope with errors 2019-02-01 16:57:05 +01:00
merge_requests Show pre-receive error message in merge request widget 2019-03-02 06:31:09 -08:00
milestones Fix MilestonesFinder to pass relations to scope 2019-01-12 00:05:36 +08:00
notes Reduce remaining diff with EE in app/services 2019-02-14 12:37:55 +01:00
projects Merge branch '53966-make-hashed-storage-migration-safer-and-more-inviting' into 'master' 2019-03-01 16:51:49 +00:00
prometheus Remove #ready? method in favor of #available? 2019-02-15 12:43:44 +13:00
protected_branches Reduce remaining diff with EE in app/services 2019-02-14 12:37:55 +01:00
protected_tags Enable more frozen string in app/services/**/*.rb 2018-07-18 14:07:50 -07:00
quick_actions Use parent instead of project 2019-01-08 02:30:37 +08:00
releases Add unique constraint to release and url 2019-01-04 22:17:03 +09:00
resource_events Preload user status for label events 2018-10-25 18:20:23 +02:00
search Reduce diff with EE in Search::GlobalService 2019-02-05 11:10:54 +01:00
submodules Add submodule update API endpoint 2018-11-07 14:03:30 +01:00
suggestions Always fetch MR latest version when creating suggestions 2019-02-26 17:19:17 -03:00
tags Add spec for Release API 2018-12-31 14:35:57 +09:00
test_hooks Rename project's pipelines relation 2018-12-05 14:39:15 +00:00
todos/destroy Rails5: Passing a class as a value in an Active Record query is deprecated 2018-11-17 16:14:36 +01:00
users Optimize Redis usage in User::ActivityService 2019-02-14 11:14:00 +01:00
wiki_pages Enable more frozen string in app/services/**/*.rb 2018-07-18 14:07:50 -07:00
wikis Replace whitespaces in wiki page attachments file names 2018-09-07 14:10:15 +00:00
access_token_validation_service.rb Add config to disable impersonation 2018-11-29 09:37:16 +01:00
after_branch_delete_service.rb Enable frozen string in apps/uploaders/*.rb 2018-07-16 06:41:59 -07:00
akismet_service.rb Enable frozen string in apps/uploaders/*.rb 2018-07-16 06:41:59 -07:00
audit_event_service.rb Add support for JSON logging for audit events 2018-10-18 15:59:12 -07:00
base_count_service.rb Enable frozen string in apps/uploaders/*.rb 2018-07-16 06:41:59 -07:00
base_renderer.rb Enable frozen string in apps/uploaders/*.rb 2018-07-16 06:41:59 -07:00
base_service.rb Enable frozen string in apps/uploaders/*.rb 2018-07-16 06:41:59 -07:00
cohorts_service.rb Disable existing offenses for the CodeReuse cops 2018-09-11 17:32:00 +02:00
compare_service.rb Enable frozen string in apps/uploaders/*.rb 2018-07-16 06:41:59 -07:00
create_branch_service.rb Reduce remaining diff with EE in app/services 2019-02-14 12:37:55 +01:00
create_snippet_service.rb Enable frozen string in apps/uploaders/*.rb 2018-07-16 06:41:59 -07:00
delete_branch_service.rb Use 'delete' instead of 'remove' for source branch 2019-01-22 12:57:01 -05:00
delete_merged_branches_service.rb Replace deprecated uniq on a Relation with distinct 2018-10-26 18:19:28 +02:00
event_create_service.rb Enable frozen string in apps/uploaders/*.rb 2018-07-16 06:41:59 -07:00
git_push_service.rb Merge branch 'fix-misspellings-app-comments' into 'master' 2019-02-26 12:25:01 +01:00
git_tag_push_service.rb Merge branch 'fix-misspellings-app-comments' into 'master' 2019-02-26 12:25:01 +01:00
gravatar_service.rb Enable frozen string in apps/uploaders/*.rb 2018-07-16 06:41:59 -07:00
ham_service.rb Enable frozen string in apps/uploaders/*.rb 2018-07-16 06:41:59 -07:00
import_export_clean_up_service.rb Disable existing offenses for the CodeReuse cops 2018-09-11 17:32:00 +02:00
issuable_base_service.rb Remove Redcarpet markdown engine 2019-02-04 12:48:35 +01:00
merge_request_metrics_service.rb Enable frozen string in apps/uploaders/*.rb 2018-07-16 06:41:59 -07:00
metrics_service.rb Enable frozen string in apps/uploaders/*.rb 2018-07-16 06:41:59 -07:00
note_summary.rb Enable frozen string in apps/uploaders/*.rb 2018-07-16 06:41:59 -07:00
notification_recipient_service.rb Reduce remaining diff with EE in app/services 2019-02-14 12:37:55 +01:00
notification_service.rb Sent notification only to authorized users 2019-01-31 16:52:49 +01:00
preview_markdown_service.rb Remove Redcarpet markdown engine 2019-02-04 12:48:35 +01:00
push_event_payload_service.rb Enable frozen string in apps/uploaders/*.rb 2018-07-16 06:41:59 -07:00
repair_ldap_blocked_user_service.rb Enable frozen string in apps/uploaders/*.rb 2018-07-16 06:41:59 -07:00
repository_archive_clean_up_service.rb Enable frozen string in apps/uploaders/*.rb 2018-07-16 06:41:59 -07:00
reset_project_cache_service.rb Enable frozen string in apps/uploaders/*.rb 2018-07-16 06:41:59 -07:00
search_service.rb Disable existing offenses for the CodeReuse cops 2018-09-11 17:32:00 +02:00
spam_check_service.rb Disable existing offenses for the CodeReuse cops 2018-09-11 17:32:00 +02:00
spam_service.rb Enable frozen string in apps/uploaders/*.rb 2018-07-16 06:41:59 -07:00
submit_usage_ping_service.rb Ask user explicitly about usage stats agreement 2018-09-07 14:32:28 +00:00
system_hooks_service.rb Enable frozen string in apps/uploaders/*.rb 2018-07-16 06:41:59 -07:00
system_note_service.rb Merge branch 'fix-misspellings-app-comments' into 'master' 2019-02-26 12:25:01 +01:00
task_list_toggle_service.rb Find checkbox input with less specific selector 2019-02-12 16:22:21 -06:00
todo_service.rb Clean up ActiveRecord code in TodoService 2018-10-08 15:19:12 +02:00
update_deployment_service.rb Squashed commit of the following: 2018-11-06 10:54:27 +09:00
update_snippet_service.rb Enable frozen string in apps/uploaders/*.rb 2018-07-16 06:41:59 -07:00
upload_service.rb Refactor upload service to return uploader 2019-01-07 11:16:58 +08:00
user_agent_detail_service.rb Enable frozen string in apps/uploaders/*.rb 2018-07-16 06:41:59 -07:00
user_project_access_changed_service.rb Enable frozen string in apps/uploaders/*.rb 2018-07-16 06:41:59 -07:00
validate_new_branch_service.rb Enable frozen string in apps/uploaders/*.rb 2018-07-16 06:41:59 -07:00
verify_pages_domain_service.rb Enable frozen string in apps/uploaders/*.rb 2018-07-16 06:41:59 -07:00
web_hook_service.rb Catch `RedirectionTooDeep` Exception in webhooks 2018-10-19 05:55:06 +00:00