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
Boxiang Sun
gitlab-ce
Commits
3e0651c7
Commit
3e0651c7
authored
Nov 28, 2016
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reorder generic commit status columns to match build status partial
parent
086da921
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
29 additions
and
22 deletions
+29
-22
app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
.../generic_commit_statuses/_generic_commit_status.html.haml
+29
-22
No files found.
app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
View file @
3e0651c7
-
admin
=
local_assigns
.
fetch
(
:admin
,
false
)
-
ref
=
local_assigns
.
fetch
(
:ref
,
nil
)
-
ref
=
local_assigns
.
fetch
(
:ref
,
nil
)
-
commit_sha
=
local_assigns
.
fetch
(
:commit_sha
,
nil
)
-
commit_sha
=
local_assigns
.
fetch
(
:commit_sha
,
nil
)
-
retried
=
local_assigns
.
fetch
(
:retried
,
false
)
-
retried
=
local_assigns
.
fetch
(
:retried
,
false
)
-
pipeline_link
=
local_assigns
.
fetch
(
:pipeline_link
,
false
)
-
pipeline_link
=
local_assigns
.
fetch
(
:pipeline_link
,
false
)
-
stage
=
local_assigns
.
fetch
(
:stage
,
false
)
-
stage
=
local_assigns
.
fetch
(
:stage
,
false
)
-
coverage
=
local_assigns
.
fetch
(
:coverage
,
false
)
-
coverage
=
local_assigns
.
fetch
(
:coverage
,
false
)
-
runner
=
local_assigns
.
fetch
(
:runner
,
false
)
%tr
.generic_commit_status
%tr
.generic_commit_status
{
class:
(
'retried'
if
retried
)}
%td
.status
%td
.status
-
if
can?
(
current_user
,
:read_commit_status
,
generic_commit_status
)
&&
generic_commit_status
.
target_url
-
if
can?
(
current_user
,
:read_commit_status
,
generic_commit_status
)
&&
generic_commit_status
.
target_url
=
ci_status_with_icon
(
generic_commit_status
.
status
,
generic_commit_status
.
target_url
)
=
ci_status_with_icon
(
generic_commit_status
.
status
,
generic_commit_status
.
target_url
)
...
@@ -16,13 +16,34 @@
...
@@ -16,13 +16,34 @@
%td
.generic_commit_status-link
%td
.generic_commit_status-link
-
if
can?
(
current_user
,
:read_commit_status
,
generic_commit_status
)
&&
generic_commit_status
.
target_url
-
if
can?
(
current_user
,
:read_commit_status
,
generic_commit_status
)
&&
generic_commit_status
.
target_url
=
link_to
generic_commit_status
.
target_url
do
=
link_to
generic_commit_status
.
target_url
do
%s
trong
##{generic_commit_status.id}
%s
pan
.build-link
##{generic_commit_status.id}
-
else
-
else
%strong
##{generic_commit_status.id}
%span
.build-link
##{generic_commit_status.id}
-
if
ref
-
if
generic_commit_status
.
ref
.icon-container
=
generic_commit_status
.
tags
.
any?
?
icon
(
'tag'
)
:
icon
(
'code-fork'
)
=
link_to
generic_commit_status
.
ref
,
namespace_project_commits_path
(
generic_commit_status
.
project
.
namespace
,
generic_commit_status
.
project
,
generic_commit_status
.
ref
)
-
else
.light
none
.icon-container.commit-icon
=
custom_icon
(
"icon_commit"
)
-
if
commit_sha
=
link_to
generic_commit_status
.
short_sha
,
namespace_project_commit_path
(
generic_commit_status
.
project
.
namespace
,
generic_commit_status
.
project
,
generic_commit_status
.
sha
),
class:
"commit-id monospace"
-
if
retried
-
if
retried
=
icon
(
'warning'
,
class:
'text-warning has-tooltip'
,
title:
'Status was retried.'
)
=
icon
(
'warning'
,
class:
'text-warning has-tooltip'
,
title:
'Status was retried.'
)
.label-container
-
if
generic_commit_status
.
tags
.
any?
-
generic_commit_status
.
tags
.
each
do
|
tag
|
%span
.label.label-primary
=
tag
-
if
retried
%span
.label.label-warning
retried
-
if
pipeline_link
-
if
pipeline_link
%td
%td
=
link_to
pipeline_path
(
generic_commit_status
.
pipeline
)
do
=
link_to
pipeline_path
(
generic_commit_status
.
pipeline
)
do
...
@@ -33,18 +54,12 @@
...
@@ -33,18 +54,12 @@
-
else
-
else
%span
.monospace
API
%span
.monospace
API
-
if
commit_sha
-
if
admin
%td
%td
=
link_to
generic_commit_status
.
short_sha
,
namespace_project_commit_path
(
generic_commit_status
.
project
.
namespace
,
generic_commit_status
.
project
,
generic_commit_status
.
sha
),
class:
"monospace"
-
if
generic_commit_status
.
project
=
link_to
generic_commit_status
.
project
.
name_with_namespace
,
admin_namespace_project_path
(
generic_commit_status
.
project
.
namespace
,
generic_commit_status
.
project
)
-
if
ref
-
if
admin
%td
-
if
generic_commit_status
.
ref
=
link_to
generic_commit_status
.
ref
,
namespace_project_commits_path
(
generic_commit_status
.
project
.
namespace
,
generic_commit_status
.
project
,
generic_commit_status
.
ref
)
-
else
.light
none
-
if
runner
%td
%td
-
if
generic_commit_status
.
try
(
:runner
)
-
if
generic_commit_status
.
try
(
:runner
)
=
runner_link
(
generic_commit_status
.
runner
)
=
runner_link
(
generic_commit_status
.
runner
)
...
@@ -58,14 +73,6 @@
...
@@ -58,14 +73,6 @@
%td
%td
=
generic_commit_status
.
name
=
generic_commit_status
.
name
%td
-
if
generic_commit_status
.
tags
.
any?
-
generic_commit_status
.
tags
.
each
do
|
tag
|
%span
.label.label-primary
=
tag
-
if
retried
%span
.label.label-warning
retried
%td
.duration
%td
.duration
-
if
generic_commit_status
.
duration
-
if
generic_commit_status
.
duration
=
icon
(
"clock-o"
)
=
icon
(
"clock-o"
)
...
...
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