gitlab-org--gitlab-foss/spec/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
registry Fix container registry controller specs 2017-04-04 11:13:12 +02:00
settings Fixed repository_controller_spec 2017-03-06 09:47:44 -06:00
artifacts_controller_spec.rb Add artifact file page that uses the blob viewer 2017-05-04 08:50:12 -05:00
avatars_controller_spec.rb Use empty_project where possible in controller specs 2017-01-25 17:14:38 -05:00
blame_controller_spec.rb Use Namespace#full_path instead of #path where appropriate 2017-02-23 17:55:01 -06:00
blob_controller_spec.rb Enable RSpec/FilePath cop 2017-04-26 12:50:32 +01:00
boards_controller_spec.rb Use Namespace#full_path instead of #path where appropriate 2017-02-23 17:55:01 -06:00
branches_controller_spec.rb Merge request widget redesign 2017-05-09 04:15:34 +00:00
builds_controller_spec.rb Improve code style related to protected actions 2017-05-03 12:32:39 +02:00
commit_controller_spec.rb Satisfy Rubocop 2017-04-05 17:44:14 +01:00
commits_controller_spec.rb Use Namespace#full_path instead of #path where appropriate 2017-02-23 17:55:01 -06:00
compare_controller_spec.rb Use Namespace#full_path instead of #path where appropriate 2017-02-23 17:55:01 -06:00
cycle_analytics_controller_spec.rb Use Namespace#full_path instead of #path where appropriate 2017-02-23 17:55:01 -06:00
deploy_keys_controller_spec.rb Project deploy keys json end point 2017-03-24 11:53:47 +01:00
deployments_controller_spec.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_spec.rb Add option to start a new discussion on an MR 2017-04-05 17:44:14 +01:00
environments_controller_spec.rb Merge request widget redesign 2017-05-09 04:15:34 +00:00
find_file_controller_spec.rb Use Namespace#full_path instead of #path where appropriate 2017-02-23 17:55:01 -06:00
forks_controller_spec.rb Use Namespace#full_path instead of #path where appropriate 2017-02-23 17:55:01 -06:00
graphs_controller_spec.rb Merge branch 'change-colour-for-testing-fallback' into 'master' 2017-03-06 09:15:47 +00:00
group_links_controller_spec.rb Use Namespace#full_path instead of #path where appropriate 2017-02-23 17:55:01 -06:00
imports_controller_spec.rb Merge branch 'open-redirect-fix-continue-to' into 'security' 2017-04-05 21:07:26 -07:00
issues_controller_spec.rb Backport of multiple_assignees_feature [ci skip] 2017-05-04 17:11:53 +03:00
labels_controller_spec.rb Refactor add_users method for project and group 2017-04-21 18:38:10 +03:00
mattermosts_controller_spec.rb Use Namespace#full_path instead of #path where appropriate 2017-02-23 17:55:01 -06:00
merge_requests_controller_spec.rb Fix conflict resolution from corrupted upstream 2017-05-12 20:47:51 +01:00
milestones_controller_spec.rb Fixed failing specs 2017-04-26 12:23:29 +01:00
notes_controller_spec.rb Display comments for personal snippets 2017-05-02 13:07:53 +02:00
pages_controller_spec.rb Disable navigation to Pages config if Pages is disabled 2017-05-04 14:11:40 +08:00
pages_domains_controller_spec.rb Disable navigation to Pages config if Pages is disabled 2017-05-04 14:11:40 +08:00
pipeline_schedules_controller_spec.rb Add Pipeline Schedules that supersedes experimental Trigger Schedule 2017-05-07 22:35:56 +00:00
pipelines_controller_spec.rb Real time pipeline show action 2017-05-06 16:45:46 +00:00
project_members_controller_spec.rb Refactor members controller destroy action 2017-04-17 17:44:30 +03:00
protected_branches_controller_spec.rb Protected Tags backend review changes 2017-04-06 10:56:21 +01:00
protected_tags_controller_spec.rb Protected Tags backend review changes 2017-04-06 10:56:21 +01:00
raw_controller_spec.rb Do not show LFS object when LFS is disabled 2017-03-13 18:15:19 +01:00
refs_controller_spec.rb Use Namespace#full_path instead of #path where appropriate 2017-02-23 17:55:01 -06:00
releases_controller_spec.rb Use Namespace#full_path instead of #path where appropriate 2017-02-23 17:55:01 -06:00
repositories_controller_spec.rb Use Namespace#full_path instead of #path where appropriate 2017-02-23 17:55:01 -06:00
runners_controller_spec.rb Use expect { }.to change { } 2017-02-15 20:21:51 +08:00
services_controller_spec.rb improves test settings for chat notification services for empty projects 2017-04-27 18:36:10 +01:00
snippets_controller_spec.rb Use Namespace#full_path instead of #path where appropriate 2017-02-23 17:55:01 -06:00
tags_controller_spec.rb Use Namespace#full_path instead of #path where appropriate 2017-02-23 17:55:01 -06:00
templates_controller_spec.rb Rename commit_file, commit_dir and remove_file and update specs 2017-02-24 09:55:01 -06:00
todos_controller_spec.rb Enable RSpec/FilePath cop 2017-04-26 12:50:32 +01:00
tree_controller_spec.rb Refactor changing files in web UI 2017-04-20 00:37:44 +00:00
uploads_controller_spec.rb Add a Project::UploadsController spec to ensure an Upload is created 2017-03-06 14:41:09 -05:00
variables_controller_spec.rb All CI offline migrations 2017-03-17 23:06:11 +00:00
wikis_controller_spec.rb Support preview_markdown action for personal_snippets 2017-04-26 12:51:06 +02:00