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
Léo-Paul Géneau
gitlab-ce
Commits
4c058fc4
Commit
4c058fc4
authored
May 24, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove icons from tables; remove timestamp from pipelines, remove info block at top of pipelines
parent
b2c41171
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
3 additions
and
32 deletions
+3
-32
app/assets/stylesheets/framework/nav.scss
app/assets/stylesheets/framework/nav.scss
+1
-1
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+0
-6
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+1
-1
app/views/projects/ci/builds/_build.html.haml
app/views/projects/ci/builds/_build.html.haml
+0
-4
app/views/projects/ci/commits/_commit.html.haml
app/views/projects/ci/commits/_commit.html.haml
+0
-7
app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
.../generic_commit_statuses/_generic_commit_status.html.haml
+0
-4
app/views/projects/pipelines/index.html.haml
app/views/projects/pipelines/index.html.haml
+1
-9
No files found.
app/assets/stylesheets/framework/nav.scss
View file @
4c058fc4
...
...
@@ -281,7 +281,7 @@
}
.page-with-layout-nav
{
margin-top
:
50px
;
margin-top
:
$header-height
+
2
;
&
.controls-dropdown-visible
{
@media
(
max-width
:
$screen-xs-min
)
{
...
...
app/assets/stylesheets/pages/merge_requests.scss
View file @
4c058fc4
...
...
@@ -280,11 +280,5 @@
background-color
:
$white-light
;
color
:
$gl-placeholder-color
;
}
th
,
td
{
padding
:
16px
;
}
}
}
app/assets/stylesheets/pages/pipelines.scss
View file @
4c058fc4
.pipelines
{
.stage
{
max-width
:
8
0px
;
max-width
:
10
0px
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
white-space
:
nowrap
;
...
...
app/views/projects/ci/builds/_build.html.haml
View file @
4c058fc4
...
...
@@ -57,14 +57,10 @@
%td
.duration
-
if
build
.
duration
=
icon
(
"clock-o"
)
#{
duration_in_words
(
build
.
finished_at
,
build
.
started_at
)
}
%td
.timestamp
-
if
build
.
finished_at
=
icon
(
"calendar"
)
%span
#{
time_ago_with_tooltip
(
build
.
finished_at
)
}
-
if
defined?
(
coverage
)
&&
coverage
...
...
app/views/projects/ci/commits/_commit.html.haml
View file @
4c058fc4
...
...
@@ -45,14 +45,7 @@
%td
-
if
commit
.
started_at
&&
commit
.
finished_at
%p
.duration
=
icon
(
"clock-o"
)
#{
duration_in_words
(
commit
.
finished_at
,
commit
.
started_at
)
}
-
if
commit
.
finished_at
%p
.finished_at
=
icon
(
"calendar"
)
#{
time_ago_with_tooltip
(
commit
.
finished_at
)
}
%td
.controls.hidden-xs.pull-right
...
...
app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
View file @
4c058fc4
...
...
@@ -50,14 +50,10 @@
%td
.duration
-
if
generic_commit_status
.
duration
=
icon
(
"clock-o"
)
#{
duration_in_words
(
generic_commit_status
.
finished_at
,
generic_commit_status
.
started_at
)
}
%td
.timestamp
-
if
generic_commit_status
.
finished_at
=
icon
(
"calendar"
)
%span
#{
time_ago_with_tooltip
(
generic_commit_status
.
finished_at
)
}
-
if
defined?
(
coverage
)
&&
coverage
...
...
app/views/projects/pipelines/index.html.haml
View file @
4c058fc4
...
...
@@ -36,14 +36,6 @@
=
icon
(
'wrench'
)
%span
CI Lint
.row-content-block
-
if
@scope
==
'running'
Running pipelines for this project
-
elsif
@scope
.
nil?
Pipelines for this project
-
else
#{
@scope
.
titleize
}
for this project
%ul
.content-list.pipelines
-
stages
=
@pipelines
.
stages
-
if
@pipelines
.
blank?
...
...
@@ -59,7 +51,7 @@
%th
.stage
%span
.has-tooltip
{
title:
"#{stage.titleize}"
}
=
stage
.
titleize
.
pluralize
%th
%th
Duration
%th
=
render
@pipelines
,
commit_sha:
true
,
stage:
true
,
allow_retry:
true
,
stages:
stages
...
...
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