diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-07-20 13:59:43 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-20 13:59:43 +0000 |
| commit | 6623d36b65a87f8db9d35a83f832ee2e0564f8b1 (patch) | |
| tree | 65b290a14f3530df312114292ff8f48a964a0aba /spec/features/projects | |
| parent | f3d03af4215763d6c51c4b26702200ba679baded (diff) | |
| parent | 545cecb28c02a2350b6ecb7a8c0080f9663734d3 (diff) | |
| download | gitlab-ce-6623d36b65a87f8db9d35a83f832ee2e0564f8b1.tar.gz | |
Merge branch '15343-build-settiings' into 'master'
Resolve "Move Build badges settings to Builds page (or Builds settings)"
## What does this MR do?
Removes pipeline settings section from project settings & creates a new pipelines settings page
Adds builds badge to pipelines settings page & removes badge page
## Are there points in the code the reviewer needs to double check?
All Rails updates -> particularly `builds_controller.rb` and `routes`
Spacing needs to be updated across all settings pages and will be in a separate MR (https://gitlab.com/gitlab-org/gitlab-ce/issues/19827)
## What are the relevant issue numbers?
Closes #15343
Part of #18920
## Screenshots (if relevant)
See merge request !5244
Diffstat (limited to 'spec/features/projects')
| -rw-r--r-- | spec/features/projects/badges/list_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/projects/badges/list_spec.rb b/spec/features/projects/badges/list_spec.rb index 01e90618a98..75166bca119 100644 --- a/spec/features/projects/badges/list_spec.rb +++ b/spec/features/projects/badges/list_spec.rb @@ -6,7 +6,7 @@ feature 'list of badges' do project = create(:project) project.team << [user, :master] login_as(user) - visit namespace_project_badges_path(project.namespace, project) + visit namespace_project_pipelines_settings_path(project.namespace, project) end scenario 'user displays list of badges' do |