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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
065375ca
Commit
065375ca
authored
Dec 08, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use "Build passed" in tooltip instead of "Build status: passed"
parent
f66454be
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/helpers/ci_status_helper.rb
app/helpers/ci_status_helper.rb
+1
-1
features/steps/dashboard/dashboard.rb
features/steps/dashboard/dashboard.rb
+1
-1
features/steps/project/merge_requests.rb
features/steps/project/merge_requests.rb
+1
-1
No files found.
app/helpers/ci_status_helper.rb
View file @
065375ca
...
@@ -46,7 +46,7 @@ module CiStatusHelper
...
@@ -46,7 +46,7 @@ module CiStatusHelper
def
render_ci_status
(
ci_commit
)
def
render_ci_status
(
ci_commit
)
link_to
ci_status_path
(
ci_commit
),
link_to
ci_status_path
(
ci_commit
),
class:
"c
#{
ci_status_color
(
ci_commit
)
}
"
,
class:
"c
#{
ci_status_color
(
ci_commit
)
}
"
,
title:
"Build
status:
#{
ci_commit
.
status
}
"
,
title:
"Build
#{
ci_commit
.
status
}
"
,
data:
{
toggle:
'tooltip'
,
placement:
'left'
}
do
data:
{
toggle:
'tooltip'
,
placement:
'left'
}
do
ci_status_icon
(
ci_commit
)
ci_status_icon
(
ci_commit
)
end
end
...
...
features/steps/dashboard/dashboard.rb
View file @
065375ca
...
@@ -12,7 +12,7 @@ class Spinach::Features::Dashboard < Spinach::FeatureSteps
...
@@ -12,7 +12,7 @@ class Spinach::Features::Dashboard < Spinach::FeatureSteps
end
end
step
'I should see "Shop" project CI status'
do
step
'I should see "Shop" project CI status'
do
expect
(
page
).
to
have_link
"Build s
tatus: s
kipped"
expect
(
page
).
to
have_link
"Build skipped"
end
end
step
'I should see last push widget'
do
step
'I should see last push widget'
do
...
...
features/steps/project/merge_requests.rb
View file @
065375ca
...
@@ -367,7 +367,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
...
@@ -367,7 +367,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
step
'I should see merge request "Bug NS-05" with CI status'
do
step
'I should see merge request "Bug NS-05" with CI status'
do
page
.
within
".mr-list"
do
page
.
within
".mr-list"
do
expect
(
page
).
to
have_link
"Build
status:
pending"
expect
(
page
).
to
have_link
"Build pending"
end
end
end
end
...
...
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