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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
e8666898
Commit
e8666898
authored
Sep 18, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Style CI project/build list
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
0aec0d53
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
21 additions
and
46 deletions
+21
-46
app/assets/stylesheets/ci/projects.scss
app/assets/stylesheets/ci/projects.scss
+1
-26
app/helpers/ci/builds_helper.rb
app/helpers/ci/builds_helper.rb
+5
-5
app/helpers/ci/commits_helper.rb
app/helpers/ci/commits_helper.rb
+6
-6
app/views/ci/admin/builds/_build.html.haml
app/views/ci/admin/builds/_build.html.haml
+1
-1
app/views/ci/admin/projects/_project.html.haml
app/views/ci/admin/projects/_project.html.haml
+1
-1
app/views/ci/admin/runners/show.html.haml
app/views/ci/admin/runners/show.html.haml
+1
-1
app/views/ci/builds/_build.html.haml
app/views/ci/builds/_build.html.haml
+1
-1
app/views/ci/builds/show.html.haml
app/views/ci/builds/show.html.haml
+2
-2
app/views/ci/commits/_commit.html.haml
app/views/ci/commits/_commit.html.haml
+1
-1
app/views/ci/commits/show.html.haml
app/views/ci/commits/show.html.haml
+1
-1
app/views/ci/projects/_project.html.haml
app/views/ci/projects/_project.html.haml
+1
-1
No files found.
app/assets/stylesheets/ci/projects.scss
View file @
e8666898
...
@@ -13,31 +13,6 @@
...
@@ -13,31 +13,6 @@
.builds
,
.builds
,
.projects-table
{
.projects-table
{
.alert-success
{
background-color
:
#6fc995
;
border-color
:
#5bba83
;
}
.alert-danger
{
background-color
:
#eb897f
;
border-color
:
#d4776e
;
}
.alert-info
{
background-color
:
#3498db
;
border-color
:
#2e8ece
;
}
.alert-warning
{
background-color
:
#EB974E
;
border-color
:
#E87E04
;
}
.alert-disabled
{
background
:
$background-color
;
border-color
:
$border-color
;
}
.light
{
.light
{
border-color
:
$border-color
;
border-color
:
$border-color
;
}
}
...
@@ -47,8 +22,8 @@
...
@@ -47,8 +22,8 @@
}
}
td
{
td
{
color
:
$gl-gray
;
vertical-align
:
middle
!
important
;
vertical-align
:
middle
!
important
;
border-color
:
inherit
!
important
;
a
{
a
{
font-weight
:
normal
;
font-weight
:
normal
;
...
...
app/helpers/ci/builds_helper.rb
View file @
e8666898
...
@@ -16,15 +16,15 @@ module Ci
...
@@ -16,15 +16,15 @@ module Ci
ci_project_build_url
(
build
.
project
,
build
)
ci_project_build_url
(
build
.
project
,
build
)
end
end
def
build_status_
alert
_class
(
build
)
def
build_status_
css
_class
(
build
)
if
build
.
success?
if
build
.
success?
'
alert
-success'
'
build
-success'
elsif
build
.
failed?
elsif
build
.
failed?
'
alert
-danger'
'
build
-danger'
elsif
build
.
canceled?
elsif
build
.
canceled?
'
alert
-disabled'
'
build
-disabled'
else
else
'
alert
-warning'
'
build
-warning'
end
end
end
end
...
...
app/helpers/ci/commits_helper.rb
View file @
e8666898
module
Ci
module
Ci
module
CommitsHelper
module
CommitsHelper
def
commit_status_
alert
_class
(
commit
)
def
commit_status_
css
_class
(
commit
)
return
'
alert
-info'
unless
commit
return
'
build
-info'
unless
commit
case
commit
.
status
case
commit
.
status
when
'success'
when
'success'
'
alert
-success'
'
build
-success'
when
'failed'
,
'canceled'
when
'failed'
,
'canceled'
'
alert
-danger'
'
build
-danger'
when
'skipped'
when
'skipped'
'
alert
-disabled'
'
build
-disabled'
else
else
'
alert
-warning'
'
build
-warning'
end
end
end
end
...
...
app/views/ci/admin/builds/_build.html.haml
View file @
e8666898
-
if
build
.
commit
&&
build
.
project
-
if
build
.
commit
&&
build
.
project
%tr
.build
.alert
{
class:
build_status_alert
_class
(
build
)}
%tr
.build
{
class:
build_status_css
_class
(
build
)}
%td
.build-link
%td
.build-link
=
link_to
ci_project_build_url
(
build
.
project
,
build
)
do
=
link_to
ci_project_build_url
(
build
.
project
,
build
)
do
%strong
#{
build
.
id
}
%strong
#{
build
.
id
}
...
...
app/views/ci/admin/projects/_project.html.haml
View file @
e8666898
-
last_commit
=
project
.
last_commit
-
last_commit
=
project
.
last_commit
%tr
.alert
{
class:
commit_status_alert
_class
(
last_commit
)
}
%tr
{
class:
commit_status_css
_class
(
last_commit
)
}
%td
%td
=
project
.
id
=
project
.
id
%td
%td
...
...
app/views/ci/admin/runners/show.html.haml
View file @
e8666898
...
@@ -102,7 +102,7 @@
...
@@ -102,7 +102,7 @@
%th
Finished at
%th
Finished at
-
@builds
.
each
do
|
build
|
-
@builds
.
each
do
|
build
|
%tr
.build.alert
{
class:
build_status_
alert
_class
(
build
)}
%tr
.build.alert
{
class:
build_status_
css
_class
(
build
)}
%td
.status
%td
.status
=
build
.
status
=
build
.
status
...
...
app/views/ci/builds/_build.html.haml
View file @
e8666898
%tr
.build
.alert
{
class:
build_status_alert
_class
(
build
)}
%tr
.build
{
class:
build_status_css
_class
(
build
)}
%td
.status
%td
.status
=
build
.
status
=
build
.
status
...
...
app/views/ci/builds/show.html.haml
View file @
e8666898
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
.row
.row
.col-md-9
.col-md-9
.build-head.alert
{
class:
build_status_
alert
_class
(
@build
)}
.build-head.alert
{
class:
build_status_
css
_class
(
@build
)}
%h4
%h4
-
if
@build
.
commit
.
tag?
-
if
@build
.
commit
.
tag?
Build for tag
Build for tag
...
@@ -150,7 +150,7 @@
...
@@ -150,7 +150,7 @@
%h4
.title
#{
pluralize
(
@builds
.
count
,
"other build"
)
}
for
#{
@build
.
short_sha
}
:
%h4
.title
#{
pluralize
(
@builds
.
count
,
"other build"
)
}
for
#{
@build
.
short_sha
}
:
%table
.builds
%table
.builds
-
@builds
.
each_with_index
do
|
build
,
i
|
-
@builds
.
each_with_index
do
|
build
,
i
|
%tr
.build.alert
{
class:
build_status_
alert
_class
(
build
)}
%tr
.build.alert
{
class:
build_status_
css
_class
(
build
)}
%td
%td
=
link_to
ci_project_build_url
(
@project
,
build
)
do
=
link_to
ci_project_build_url
(
@project
,
build
)
do
%span
##{build.id}
%span
##{build.id}
...
...
app/views/ci/commits/_commit.html.haml
View file @
e8666898
%tr
.build
.alert
{
class:
commit_status_alert
_class
(
commit
)}
%tr
.build
{
class:
commit_status_css
_class
(
commit
)}
%td
.status
%td
.status
=
commit
.
status
=
commit
.
status
-
if
commit
.
running?
-
if
commit
.
running?
...
...
app/views/ci/commits/show.html.haml
View file @
e8666898
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
%h3
Status
%h3
Status
.build.alert
{
class:
commit_status_
alert
_class
(
@commit
)}
.build.alert
{
class:
commit_status_
css
_class
(
@commit
)}
.status
.status
=
@commit
.
status
.
titleize
=
@commit
.
status
.
titleize
...
...
app/views/ci/projects/_project.html.haml
View file @
e8666898
-
last_commit
=
project
.
last_commit
-
last_commit
=
project
.
last_commit
%tr
.alert
{
class:
commit_status_alert
_class
(
last_commit
)
}
%tr
{
class:
commit_status_css
_class
(
last_commit
)
}
%td
%td
=
link_to
[
:ci
,
project
]
do
=
link_to
[
:ci
,
project
]
do
=
project
.
name
=
project
.
name
...
...
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