diff options
| author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-07-14 16:19:28 -0500 |
|---|---|---|
| committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-07-19 05:30:12 -0700 |
| commit | 6445cec718fd9bcfd2944aab9f88c6760d27dcd4 (patch) | |
| tree | 68d26cc08d0089fb4b945b877e1bcb0ab7b14838 | |
| parent | 667aba6f3b6443c11ab99043c692b446abf10460 (diff) | |
| download | gitlab-ce-6445cec718fd9bcfd2944aab9f88c6760d27dcd4.tar.gz | |
Update badges path
| -rw-r--r-- | app/controllers/projects/refs_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/builds/settings.html.haml | 1 | ||||
| -rw-r--r-- | features/steps/project/badges/build.rb | 2 | ||||
| -rw-r--r-- | spec/features/projects/badges/list_spec.rb | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/app/controllers/projects/refs_controller.rb b/app/controllers/projects/refs_controller.rb index d79f16e6a5a..3b08573ca99 100644 --- a/app/controllers/projects/refs_controller.rb +++ b/app/controllers/projects/refs_controller.rb @@ -25,7 +25,7 @@ class Projects::RefsController < Projects::ApplicationController when "graphs_commits" commits_namespace_project_graph_path(@project.namespace, @project, @id) when "badges" - namespace_project_badges_path(@project.namespace, @project, ref: @id) + settings_namespace_project_builds_path(@project.namespace, @project, ref: @id) else namespace_project_commits_path(@project.namespace, @project, @id) end diff --git a/app/views/projects/builds/settings.html.haml b/app/views/projects/builds/settings.html.haml index 9d267ea1ddf..c7d96de8661 100644 --- a/app/views/projects/builds/settings.html.haml +++ b/app/views/projects/builds/settings.html.haml @@ -76,7 +76,6 @@ %hr -- badges_path = namespace_project_badges_path(@project.namespace, @project) .row.prepend-top-default .col-lg-3.profile-settings-sidebar %h4.prepend-top-0 diff --git a/features/steps/project/badges/build.rb b/features/steps/project/badges/build.rb index 66a48a176e5..d8ca0d8fd5c 100644 --- a/features/steps/project/badges/build.rb +++ b/features/steps/project/badges/build.rb @@ -5,7 +5,7 @@ class Spinach::Features::ProjectBadgesBuild < Spinach::FeatureSteps include RepoHelpers step 'I display builds badge for a master branch' do - visit build_namespace_project_badges_path(@project.namespace, @project, ref: :master, format: :svg) + visit settings_namespace_project_builds_path(@project.namespace, @project, ref: :master, format: :svg) end step 'I should see a build success badge' do diff --git a/spec/features/projects/badges/list_spec.rb b/spec/features/projects/badges/list_spec.rb index 01e90618a98..e5e900b5202 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 settings_namespace_project_builds_path(project.namespace, project) end scenario 'user displays list of badges' do |