Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
6445cec7
Commit
6445cec7
authored
Jul 14, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update badges path
parent
667aba6f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
4 deletions
+3
-4
app/controllers/projects/refs_controller.rb
app/controllers/projects/refs_controller.rb
+1
-1
app/views/projects/builds/settings.html.haml
app/views/projects/builds/settings.html.haml
+0
-1
features/steps/project/badges/build.rb
features/steps/project/badges/build.rb
+1
-1
spec/features/projects/badges/list_spec.rb
spec/features/projects/badges/list_spec.rb
+1
-1
No files found.
app/controllers/projects/refs_controller.rb
View file @
6445cec7
...
@@ -25,7 +25,7 @@ class Projects::RefsController < Projects::ApplicationController
...
@@ -25,7 +25,7 @@ class Projects::RefsController < Projects::ApplicationController
when
"graphs_commits"
when
"graphs_commits"
commits_namespace_project_graph_path
(
@project
.
namespace
,
@project
,
@id
)
commits_namespace_project_graph_path
(
@project
.
namespace
,
@project
,
@id
)
when
"badges"
when
"badges"
namespace_project_badge
s_path
(
@project
.
namespace
,
@project
,
ref:
@id
)
settings_namespace_project_build
s_path
(
@project
.
namespace
,
@project
,
ref:
@id
)
else
else
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
@id
)
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
@id
)
end
end
...
...
app/views/projects/builds/settings.html.haml
View file @
6445cec7
...
@@ -76,7 +76,6 @@
...
@@ -76,7 +76,6 @@
%hr
%hr
-
badges_path
=
namespace_project_badges_path
(
@project
.
namespace
,
@project
)
.row.prepend-top-default
.row.prepend-top-default
.col-lg-3.profile-settings-sidebar
.col-lg-3.profile-settings-sidebar
%h4
.prepend-top-0
%h4
.prepend-top-0
...
...
features/steps/project/badges/build.rb
View file @
6445cec7
...
@@ -5,7 +5,7 @@ class Spinach::Features::ProjectBadgesBuild < Spinach::FeatureSteps
...
@@ -5,7 +5,7 @@ class Spinach::Features::ProjectBadgesBuild < Spinach::FeatureSteps
include
RepoHelpers
include
RepoHelpers
step
'I display builds badge for a master branch'
do
step
'I display builds badge for a master branch'
do
visit
build_namespace_project_badge
s_path
(
@project
.
namespace
,
@project
,
ref: :master
,
format: :svg
)
visit
settings_namespace_project_build
s_path
(
@project
.
namespace
,
@project
,
ref: :master
,
format: :svg
)
end
end
step
'I should see a build success badge'
do
step
'I should see a build success badge'
do
...
...
spec/features/projects/badges/list_spec.rb
View file @
6445cec7
...
@@ -6,7 +6,7 @@ feature 'list of badges' do
...
@@ -6,7 +6,7 @@ feature 'list of badges' do
project
=
create
(
:project
)
project
=
create
(
:project
)
project
.
team
<<
[
user
,
:master
]
project
.
team
<<
[
user
,
:master
]
login_as
(
user
)
login_as
(
user
)
visit
namespace_project_badge
s_path
(
project
.
namespace
,
project
)
visit
settings_namespace_project_build
s_path
(
project
.
namespace
,
project
)
end
end
scenario
'user displays list of badges'
do
scenario
'user displays list of badges'
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment