gitlab-org--gitlab-foss/spec/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
..
auth
boards
chat_names
ci Merge branch 'retried-in-database-mysql' into 'master' 2017-05-10 22:07:05 +00:00
discussions
files Refactor changing files in web UI 2017-04-20 00:37:44 +00:00
groups add spec and changelog 2017-04-19 10:15:52 +02:00
issuable fix for Follow-up from "Backport of Multiple Assignees feature 2017-05-11 19:11:49 +03:00
issues Move update_assignee_cache_counts to the service 2017-05-12 14:12:29 +03:00
labels
members Fix specs 2017-05-04 22:34:15 -05:00
merge_requests Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master' 2017-05-12 20:37:30 +00:00
milestones
notes Merge branch 'mia_backort' into 'master' 2017-05-05 19:17:28 +00:00
projects Use relative paths for group/project/user avatars 2017-05-10 15:26:17 +11:00
protected_branches
protected_tags
search Refactor group search out of global search 2017-04-18 15:41:17 +01:00
slash_commands Multiple issue assignee: resolve conflicts after merging upstream 2017-05-05 18:22:54 +03:00
tags
users [Multiple issue assignee] Fix a number of specs 2017-05-05 15:30:19 +03:00
wiki_pages
access_token_validation_service_spec.rb
after_branch_delete_service_spec.rb
cohorts_service_spec.rb Enable the Style/TrailingCommaInLiteral cop 2017-05-10 18:25:45 +02:00
compare_service_spec.rb
create_branch_service_spec.rb
create_deployment_service_spec.rb Enable the Style/TrailingCommaInLiteral cop 2017-05-10 18:25:45 +02:00
create_release_service_spec.rb
create_snippet_service_spec.rb
delete_branch_service_spec.rb
delete_merged_branches_service_spec.rb Add confirm delete protected branch modal 2017-05-08 07:41:58 +00:00
event_create_service_spec.rb Add a new Gitlab::UserActivities class to track user activities 2017-04-14 15:20:55 +02:00
git_hooks_service_spec.rb
git_push_service_spec.rb Merge branch 'deltas-only' into 'master' 2017-05-09 15:38:38 +00:00
git_tag_push_service_spec.rb
import_export_clean_up_service_spec.rb
note_summary_spec.rb
notification_service_spec.rb Enable the Style/TrailingCommaInLiteral cop 2017-05-10 18:25:45 +02:00
pages_service_spec.rb
preview_markdown_service_spec.rb Display slash commands outcome when previewing Markdown 2017-05-04 17:02:25 +02:00
repair_ldap_blocked_user_service_spec.rb
repository_archive_clean_up_service_spec.rb
search_service_spec.rb
spam_service_spec.rb
system_hooks_service_spec.rb
system_note_service_spec.rb fix for Follow-up from "Backport of Multiple Assignees feature 2017-05-11 19:11:49 +03:00
test_hook_service_spec.rb
todo_service_spec.rb Backport of multiple_assignees_feature [ci skip] 2017-05-04 17:11:53 +03:00
update_release_service_spec.rb
update_snippet_service_spec.rb
upload_service_spec.rb Support uploaders for personal snippets comments 2017-05-02 15:22:24 +02:00
user_project_access_changed_service_spec.rb