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
f0d6b1ff
Commit
f0d6b1ff
authored
Aug 16, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Hide branch name and status text on mr pipelines; don't use shorter timeago
parent
bcb3937d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
10 deletions
+28
-10
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+16
-0
app/views/projects/ci/pipelines/_pipeline.html.haml
app/views/projects/ci/pipelines/_pipeline.html.haml
+11
-9
app/views/projects/commit/_pipelines_list.haml
app/views/projects/commit/_pipelines_list.haml
+1
-1
No files found.
app/assets/stylesheets/pages/pipelines.scss
View file @
f0d6b1ff
...
@@ -229,3 +229,19 @@
...
@@ -229,3 +229,19 @@
box-shadow
:
none
;
box-shadow
:
none
;
}
}
}
}
.pipelines.tab-pane
{
.content-list.pipelines
{
width
:
auto
;
}
.table.builds
{
min-width
:
900px
;
}
.stage
{
max-width
:
60px
;
width
:
60px
;
}
}
app/views/projects/ci/pipelines/_pipeline.html.haml
View file @
f0d6b1ff
...
@@ -2,19 +2,21 @@
...
@@ -2,19 +2,21 @@
%tr
.commit
%tr
.commit
%td
.commit-link
%td
.commit-link
=
link_to
namespace_project_pipeline_path
(
@project
.
namespace
,
@project
,
pipeline
.
id
)
do
=
link_to
namespace_project_pipeline_path
(
@project
.
namespace
,
@project
,
pipeline
.
id
)
do
=
ci_status_with_icon
(
status
)
-
if
defined?
(
status_icon_only
)
&&
status_icon_only
=
ci_icon_for_status
(
status
)
-
else
=
ci_status_with_icon
(
status
)
%td
%td
.branch-commit
.branch-commit
=
link_to
namespace_project_pipeline_path
(
@project
.
namespace
,
@project
,
pipeline
.
id
)
do
=
link_to
namespace_project_pipeline_path
(
@project
.
namespace
,
@project
,
pipeline
.
id
)
do
%span
##{pipeline.id}
%span
##{pipeline.id}
-
if
pipeline
.
ref
-
if
pipeline
.
ref
.icon-container
-
unless
defined?
(
hide_branch
)
&&
hide_branch
=
pipeline
.
tag?
?
icon
(
'tag'
)
:
icon
(
'code-fork'
)
.icon-container
=
link_to
pipeline
.
ref
,
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
pipeline
.
ref
),
class:
"monospace branch-name"
=
pipeline
.
tag?
?
icon
(
'tag'
)
:
icon
(
'code-fork'
)
.icon-container
=
link_to
pipeline
.
ref
,
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
pipeline
.
ref
),
class:
"monospace branch-name"
=
custom_icon
(
"icon_commit"
)
.icon-container
=
custom_icon
(
"icon_commit"
)
=
link_to
pipeline
.
short_sha
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
pipeline
.
sha
),
class:
"commit-id monospace"
=
link_to
pipeline
.
short_sha
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
pipeline
.
sha
),
class:
"commit-id monospace"
-
if
pipeline
.
latest?
-
if
pipeline
.
latest?
%span
.label.label-success.has-tooltip
{
title:
'Latest build for this branch'
}
latest
%span
.label.label-success.has-tooltip
{
title:
'Latest build for this branch'
}
latest
...
@@ -53,7 +55,7 @@
...
@@ -53,7 +55,7 @@
-
if
pipeline
.
finished_at
-
if
pipeline
.
finished_at
%p
.finished-at
%p
.finished-at
=
icon
(
"calendar"
)
=
icon
(
"calendar"
)
#{
time_ago_with_tooltip
(
pipeline
.
finished_at
,
short_format:
tru
e
,
skip_js:
true
)
}
#{
time_ago_with_tooltip
(
pipeline
.
finished_at
,
short_format:
fals
e
,
skip_js:
true
)
}
%td
.pipeline-actions
%td
.pipeline-actions
.controls.hidden-xs.pull-right
.controls.hidden-xs.pull-right
...
...
app/views/projects/commit/_pipelines_list.haml
View file @
f0d6b1ff
...
@@ -14,4 +14,4 @@
...
@@ -14,4 +14,4 @@
=
stage
.
titleize
=
stage
.
titleize
%th
%th
%th
%th
=
render
pipelines
,
commit_sha:
true
,
stage:
true
,
allow_retry:
true
,
stages:
pipelines
.
stages
=
render
pipelines
,
commit_sha:
true
,
stage:
true
,
allow_retry:
true
,
stages:
pipelines
.
stages
,
status_icon_only:
true
,
hide_branch:
true
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