gitlab-org--gitlab-foss/app/controllers/projects
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
..
boards Backport of multiple_assignees_feature [ci skip] 2017-05-04 17:11:53 +03:00
cycle_analytics
registry Add minor improvements to container registry code 2017-04-06 10:23:51 +02:00
settings Accept default branch param on notifaction services 2017-04-28 14:06:03 +00:00
application_controller.rb Merge branch 'feature/gb/manual-actions-protected-branches-permissions' into 'master' 2017-05-06 17:17:02 +00:00
artifacts_controller.rb Add artifact file page that uses the blob viewer 2017-05-04 08:50:12 -05:00
autocomplete_sources_controller.rb
avatars_controller.rb
badges_controller.rb
blame_controller.rb
blob_controller.rb Use blob viewers for snippets 2017-04-30 11:21:20 -05:00
boards_controller.rb
branches_controller.rb Merge request widget redesign 2017-05-09 04:15:34 +00:00
builds_controller.rb Merge request widget redesign 2017-05-09 04:15:34 +00:00
commit_controller.rb Merge request widget redesign 2017-05-09 04:15:34 +00:00
commits_controller.rb
compare_controller.rb Fix specs 2017-04-09 22:27:45 -05:00
cycle_analytics_controller.rb
deploy_keys_controller.rb Re-wrote to match our docs - still not 100% sure but closer than it was 2017-04-28 17:06:19 +01:00
deployments_controller.rb Respond with 404 when metrics are not enabled or deployment_metrics is not implemented 2017-05-12 18:16:22 +02:00
discussions_controller.rb Add option to start a new discussion on an MR 2017-04-05 17:44:14 +01:00
environments_controller.rb Merge request widget redesign 2017-05-09 04:15:34 +00:00
find_file_controller.rb
forks_controller.rb ProjectsFinder should handle more options 2017-04-06 07:11:37 +02:00
git_http_client_controller.rb
git_http_controller.rb Pass GL_REPOSITORY in Workhorse responses 2017-05-05 10:52:06 -03:00
graphs_controller.rb
group_links_controller.rb
hooks_controller.rb Implement ability to update hooks 2017-04-28 11:49:57 +00:00
imports_controller.rb
issues_controller.rb Merge branch 'master' into refactor-realtime-issue 2017-05-11 09:32:41 +01:00
labels_controller.rb Colorize labels in issue search field 2017-05-05 22:47:32 +00:00
lfs_api_controller.rb Enable the Style/TrailingCommaInLiteral cop 2017-05-10 18:25:45 +02:00
lfs_storage_controller.rb
mattermosts_controller.rb
merge_requests_controller.rb Fix conflict resolution from corrupted upstream 2017-05-12 20:47:51 +01:00
milestones_controller.rb Fixed feature spec not waiting for ajax request to finish 2017-04-26 12:23:29 +01:00
network_controller.rb
notes_controller.rb Support comments for personal snippets 2017-05-05 15:45:49 +02:00
pages_controller.rb Disable navigation to Pages config if Pages is disabled 2017-05-04 14:11:40 +08:00
pages_domains_controller.rb Disable navigation to Pages config if Pages is disabled 2017-05-04 14:11:40 +08:00
pipeline_schedules_controller.rb Add Pipeline Schedules that supersedes experimental Trigger Schedule 2017-05-07 22:35:56 +00:00
pipelines_controller.rb Enable the Style/TrailingCommaInLiteral cop 2017-05-10 18:25:45 +02:00
pipelines_settings_controller.rb add auto-cancel for pending pipelines on branch, if they are not HEAD 2017-04-04 21:11:24 +03:00
project_members_controller.rb Refactor members controller destroy action 2017-04-17 17:44:30 +03:00
protected_branches_controller.rb Protected Tags backend review changes 2017-04-06 10:56:21 +01:00
protected_refs_controller.rb Protected Tags backend review changes 2017-04-06 10:56:21 +01:00
protected_tags_controller.rb Protected Tags backend review changes 2017-04-06 10:56:21 +01:00
raw_controller.rb Refactor Blob support of external storage in preparation of job artifact blobs 2017-05-03 10:20:05 -05:00
refs_controller.rb
releases_controller.rb
repositories_controller.rb
runner_projects_controller.rb
runners_controller.rb
services_controller.rb
snippets_controller.rb Merge branch 'snippets-finder-visibility' into 'security' 2017-05-10 16:48:18 +02:00
tags_controller.rb Keep input data after creating existing tag 2017-05-10 17:39:50 -04:00
templates_controller.rb
todos_controller.rb
tree_controller.rb Enable the Style/TrailingCommaInLiteral cop 2017-05-10 18:25:45 +02:00
triggers_controller.rb Fix ref reference 2017-04-07 16:17:29 +02:00
uploads_controller.rb Support uploaders for personal snippets comments 2017-05-02 15:22:24 +02:00
variables_controller.rb
wikis_controller.rb Display slash commands outcome when previewing Markdown 2017-05-04 17:02:25 +02:00