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
ccddde50
Commit
ccddde50
authored
Nov 22, 2016
by
Dimitrie Hoekstra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
additional fixes
parent
9124b596
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
9 deletions
+5
-9
app/assets/stylesheets/pages/icons.scss
app/assets/stylesheets/pages/icons.scss
+1
-1
app/assets/stylesheets/pages/status.scss
app/assets/stylesheets/pages/status.scss
+0
-5
app/views/projects/ci/pipelines/_pipeline.html.haml
app/views/projects/ci/pipelines/_pipeline.html.haml
+3
-2
app/views/projects/merge_requests/widget/_heading.html.haml
app/views/projects/merge_requests/widget/_heading.html.haml
+1
-1
No files found.
app/assets/stylesheets/pages/icons.scss
View file @
ccddde50
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
}
}
.ci-status-icon-pending
,
.ci-status-icon-pending
,
.ci-status-icon-success_with_warning
{
.ci-status-icon-success_with_warning
s
{
color
:
$gl-warning
;
color
:
$gl-warning
;
svg
{
svg
{
...
...
app/assets/stylesheets/pages/status.scss
View file @
ccddde50
...
@@ -114,11 +114,6 @@
...
@@ -114,11 +114,6 @@
overflow
:
visible
;
overflow
:
visible
;
}
}
}
}
}
}
.visible-xs-inline
{
.visible-xs-inline
{
...
...
app/views/projects/ci/pipelines/_pipeline.html.haml
View file @
ccddde50
...
@@ -4,8 +4,9 @@
...
@@ -4,8 +4,9 @@
%tr
.commit
%tr
.commit
%td
.commit-link
%td
.commit-link
=
link_to
namespace_project_pipeline_path
(
pipeline
.
project
.
namespace
,
pipeline
.
project
,
pipeline
.
id
)
do
=
link_to
namespace_project_pipeline_path
(
pipeline
.
project
.
namespace
,
pipeline
.
project
,
pipeline
.
id
),
class:
"ci-status ci-
#{
status
}
"
do
=
ci_status_with_icon
(
status
)
=
ci_icon_for_status
(
status
)
=
ci_label_for_status
(
status
)
%td
%td
=
link_to
namespace_project_pipeline_path
(
pipeline
.
project
.
namespace
,
pipeline
.
project
,
pipeline
.
id
)
do
=
link_to
namespace_project_pipeline_path
(
pipeline
.
project
.
namespace
,
pipeline
.
project
,
pipeline
.
id
)
do
...
...
app/views/projects/merge_requests/widget/_heading.html.haml
View file @
ccddde50
-
if
@pipeline
-
if
@pipeline
.mr-widget-heading
.mr-widget-heading
-
%w[success success_with_warnings skipped canceled failed running pending]
.
each
do
|
status
|
-
%w[success success_with_warnings skipped canceled failed running pending]
.
each
do
|
status
|
.ci_widget
{
class:
"ci-#{status}"
,
style:
(
"display:none"
unless
@pipeline
.
status
==
status
)
}
.ci_widget
{
class:
"ci-
status-icon-
#{status}"
,
style:
(
"display:none"
unless
@pipeline
.
status
==
status
)
}
=
ci_icon_for_status
(
status
)
=
ci_icon_for_status
(
status
)
%span
%span
Pipeline
Pipeline
...
...
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