gitlab-org--gitlab-foss/app/services
Douwe Maan e4261fe3ce Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master'
Fix conflict resolution from corrupted upstream

Closes gitlab-ee#2128

See merge request !11298
2017-05-12 20:37:30 +00:00
..
application_settings
auth Add test example for invalid registry access request 2017-03-31 12:37:44 +02:00
boards Enable the Style/TrailingCommaInArguments cop 2017-05-10 18:25:45 +02:00
chat_names
ci Merge branch 'retried-in-database-mysql' into 'master' 2017-05-10 22:07:05 +00:00
commits Refactor changing files in web UI 2017-04-20 00:37:44 +00:00
concerns/issues Implement review comments from @DouweM for !10467. 2017-04-06 22:39:40 +05:30
discussions
files Refactor changing files in web UI 2017-04-20 00:37:44 +00:00
groups
issuable fix for Follow-up from "Backport of Multiple Assignees feature 2017-05-11 19:11:49 +03:00
issues Multiple issue assignee: fix for CE restrictions 2017-05-05 20:07:35 +03:00
labels
mattermost
members Move update_assignee_cache_counts to the service 2017-05-12 14:12:29 +03:00
merge_requests Fix conflict resolution from corrupted upstream 2017-05-12 20:47:51 +01:00
milestones
notes Support comments for personal snippets 2017-05-05 15:45:49 +02:00
projects Enable the Style/TrailingCommaInLiteral cop 2017-05-10 18:25:45 +02:00
protected_branches Protected Tags backend review changes 2017-04-06 10:56:21 +01:00
protected_tags Protected Tags backend review changes 2017-04-06 10:56:21 +01:00
search Merge branch 'snippets-finder-visibility' into 'security' 2017-05-10 16:48:18 +02:00
slash_commands Multiple issue assignee: resolve conflicts after merging upstream 2017-05-05 18:22:54 +03:00
tags
users Fix logic in Users::CreateService broken by the fix for OAuth users 2017-04-26 10:08:44 +02:00
wiki_pages
access_token_validation_service.rb
after_branch_delete_service.rb
akismet_service.rb Enable the Style/TrailingCommaInLiteral cop 2017-05-10 18:25:45 +02:00
audit_event_service.rb Enable the Style/TrailingCommaInLiteral cop 2017-05-10 18:25:45 +02:00
base_service.rb Log errors in UpdatePagesService 2017-03-31 16:15:10 +02:00
cohorts_service.rb Use last_activity_on in cohorts 2017-04-14 15:20:55 +02:00
compare_service.rb
create_branch_service.rb
create_deployment_service.rb
create_release_service.rb
create_snippet_service.rb
delete_branch_service.rb Add confirm delete protected branch modal 2017-05-08 07:41:58 +00:00
delete_merged_branches_service.rb Don't delete a branch involved in an open merge request in "Delete all merged branches" service 2017-04-19 07:56:08 -07:00
event_create_service.rb Add user activity service and spec. Also added relevant - NOT offline - migration 2017-04-14 15:20:55 +02:00
git_hooks_service.rb
git_operation_service.rb
git_push_service.rb Merge branch 'deltas-only' into 'master' 2017-05-09 15:38:38 +00:00
git_tag_push_service.rb
gravatar_service.rb
ham_service.rb
import_export_clean_up_service.rb
issuable_base_service.rb Move update_assignee_cache_counts to the service 2017-05-12 14:12:29 +03:00
note_summary.rb
notification_recipient_service.rb Backport of multiple_assignees_feature [ci skip] 2017-05-04 17:11:53 +03:00
notification_service.rb Enable the Style/TrailingCommaInArguments cop 2017-05-10 18:25:45 +02:00
pages_service.rb
preview_markdown_service.rb Display slash commands outcome when previewing Markdown 2017-05-04 17:02:25 +02:00
repair_ldap_blocked_user_service.rb
repository_archive_clean_up_service.rb
search_service.rb Refactor group search out of global search 2017-04-18 15:41:17 +01:00
spam_check_service.rb
spam_service.rb
system_hooks_service.rb Enable the Style/TrailingCommaInArguments cop 2017-05-10 18:25:45 +02:00
system_note_service.rb Merge branch 'dm-dependency-linker-gemfile' into 'master' 2017-05-12 17:27:42 +00:00
test_hook_service.rb
todo_service.rb Backport of multiple_assignees_feature [ci skip] 2017-05-04 17:11:53 +03:00
update_release_service.rb
update_snippet_service.rb
upload_service.rb Support uploaders for personal snippets comments 2017-05-02 15:22:24 +02:00
user_agent_detail_service.rb
user_project_access_changed_service.rb
validate_new_branch_service.rb Refactor changing files in web UI 2017-04-20 00:37:44 +00:00