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
Kazuhiko Shiozaki
gitlab-ce
Commits
e718bab9
Commit
e718bab9
authored
Dec 02, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
"CI build passed", not "CI build success"
parent
6789bd25
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
19 additions
and
14 deletions
+19
-14
app/assets/stylesheets/pages/profile.scss
app/assets/stylesheets/pages/profile.scss
+0
-6
app/helpers/ci_status_helper.rb
app/helpers/ci_status_helper.rb
+14
-2
app/views/projects/_last_commit.html.haml
app/views/projects/_last_commit.html.haml
+1
-1
app/views/projects/builds/show.html.haml
app/views/projects/builds/show.html.haml
+1
-1
app/views/projects/commit/_commit_box.html.haml
app/views/projects/commit/_commit_box.html.haml
+1
-1
app/views/projects/merge_requests/widget/_heading.html.haml
app/views/projects/merge_requests/widget/_heading.html.haml
+2
-3
No files found.
app/assets/stylesheets/pages/profile.scss
View file @
e718bab9
...
@@ -5,12 +5,6 @@
...
@@ -5,12 +5,6 @@
}
}
}
}
.btn-build-token
{
float
:
left
;
padding
:
6px
20px
;
margin-right
:
12px
;
}
.profile-avatar-form-option
{
.profile-avatar-form-option
{
hr
{
hr
{
margin
:
10px
0
;
margin
:
10px
0
;
...
...
app/helpers/ci_status_helper.rb
View file @
e718bab9
...
@@ -8,6 +8,10 @@ module CiStatusHelper
...
@@ -8,6 +8,10 @@ module CiStatusHelper
ci_icon_for_status
(
ci_commit
.
status
)
ci_icon_for_status
(
ci_commit
.
status
)
end
end
def
ci_status_label
(
ci_commit
)
ci_label_for_status
(
ci_commit
.
status
)
end
def
ci_status_color
(
ci_commit
)
def
ci_status_color
(
ci_commit
)
case
ci_commit
.
status
case
ci_commit
.
status
when
'success'
when
'success'
...
@@ -23,7 +27,15 @@ module CiStatusHelper
...
@@ -23,7 +27,15 @@ module CiStatusHelper
def
ci_status_with_icon
(
status
)
def
ci_status_with_icon
(
status
)
content_tag
:span
,
class:
"ci-status ci-
#{
status
}
"
do
content_tag
:span
,
class:
"ci-status ci-
#{
status
}
"
do
ci_icon_for_status
(
status
)
+
' '
.
html_safe
+
status
ci_icon_for_status
(
status
)
+
' '
.
html_safe
+
ci_label_for_status
(
status
)
end
end
def
ci_label_for_status
(
status
)
if
status
==
'success'
'passed'
else
status
end
end
end
end
...
@@ -46,7 +58,7 @@ module CiStatusHelper
...
@@ -46,7 +58,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 status:
#{
ci_
status_label
(
ci_commit
)
}
"
,
data:
{
toggle:
'tooltip'
,
placement:
'left'
}
do
data:
{
toggle:
'tooltip'
,
placement:
'left'
}
do
ci_status_icon
(
ci_commit
)
ci_status_icon
(
ci_commit
)
end
end
...
...
app/views/projects/_last_commit.html.haml
View file @
e718bab9
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
-
if
ci_commit
-
if
ci_commit
=
link_to
ci_status_path
(
ci_commit
),
class:
"ci-status ci-
#{
ci_commit
.
status
}
"
do
=
link_to
ci_status_path
(
ci_commit
),
class:
"ci-status ci-
#{
ci_commit
.
status
}
"
do
=
ci_status_icon
(
ci_commit
)
=
ci_status_icon
(
ci_commit
)
=
ci_
commit
.
status
=
ci_
status_label
(
ci_commit
)
=
link_to
commit
.
short_id
,
namespace_project_commit_path
(
project
.
namespace
,
project
,
commit
),
class:
"commit_short_id"
=
link_to
commit
.
short_id
,
namespace_project_commit_path
(
project
.
namespace
,
project
,
commit
),
class:
"commit_short_id"
=
link_to_gfm
commit
.
title
,
namespace_project_commit_path
(
project
.
namespace
,
project
,
commit
),
class:
"commit-row-message"
=
link_to_gfm
commit
.
title
,
namespace_project_commit_path
(
project
.
namespace
,
project
,
commit
),
class:
"commit-row-message"
...
...
app/views/projects/builds/show.html.haml
View file @
e718bab9
-
page_title
"
#{
@build
.
name
}
(
#{
@build
.
id
}
)"
,
"Builds"
-
page_title
"
#{
@build
.
name
}
(#
#
{
@build
.
id
}
)"
,
"Builds"
=
render
"header_title"
=
render
"header_title"
.build-page
.build-page
...
...
app/views/projects/commit/_commit_box.html.haml
View file @
e718bab9
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
=
link_to
ci_status_path
(
@ci_commit
),
class:
"ci-status ci-
#{
@ci_commit
.
status
}
"
do
=
link_to
ci_status_path
(
@ci_commit
),
class:
"ci-status ci-
#{
@ci_commit
.
status
}
"
do
=
ci_status_icon
(
@ci_commit
)
=
ci_status_icon
(
@ci_commit
)
build:
build:
=
@ci_commit
.
status
=
ci_status_label
(
@ci_commit
)
.commit-info-row.branches
.commit-info-row.branches
%i
.fa.fa-spinner.fa-spin
%i
.fa.fa-spinner.fa-spin
...
...
app/views/projects/merge_requests/widget/_heading.html.haml
View file @
e718bab9
-
ci_commit
=
@merge_request
.
ci_commit
-
ci_commit
=
@merge_request
.
ci_commit
-
if
ci_commit
-
if
ci_commit
-
status
=
ci_commit
.
status
.mr-widget-heading
.mr-widget-heading
.ci_widget
{
class:
"ci-#{status}"
}
.ci_widget
{
class:
"ci-#{
ci_commit.
status}"
}
=
ci_status_icon
(
ci_commit
)
=
ci_status_icon
(
ci_commit
)
%span
CI build
#{
status
}
%span
CI build
#{
ci_status_label
(
ci_commit
)
}
for
#{
@merge_request
.
last_commit_short_sha
}
.
for
#{
@merge_request
.
last_commit_short_sha
}
.
%span
.ci-coverage
%span
.ci-coverage
=
link_to
"View build details"
,
ci_status_path
(
ci_commit
)
=
link_to
"View build details"
,
ci_status_path
(
ci_commit
)
...
...
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