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
e3c7d264
Commit
e3c7d264
authored
Oct 02, 2017
by
Tim Zallmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated also Badge + Dropdown Icons
parent
df434817
Changes
20
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
22 additions
and
22 deletions
+22
-22
app/views/ci/status/_badge.html.haml
app/views/ci/status/_badge.html.haml
+2
-2
app/views/ci/status/_dropdown_graph_badge.html.haml
app/views/ci/status/_dropdown_graph_badge.html.haml
+2
-2
lib/gitlab/ci/status/canceled.rb
lib/gitlab/ci/status/canceled.rb
+1
-1
lib/gitlab/ci/status/created.rb
lib/gitlab/ci/status/created.rb
+1
-1
lib/gitlab/ci/status/failed.rb
lib/gitlab/ci/status/failed.rb
+1
-1
lib/gitlab/ci/status/manual.rb
lib/gitlab/ci/status/manual.rb
+1
-1
lib/gitlab/ci/status/pending.rb
lib/gitlab/ci/status/pending.rb
+1
-1
lib/gitlab/ci/status/running.rb
lib/gitlab/ci/status/running.rb
+1
-1
lib/gitlab/ci/status/skipped.rb
lib/gitlab/ci/status/skipped.rb
+1
-1
lib/gitlab/ci/status/success.rb
lib/gitlab/ci/status/success.rb
+1
-1
lib/gitlab/ci/status/success_warning.rb
lib/gitlab/ci/status/success_warning.rb
+1
-1
spec/lib/gitlab/ci/status/canceled_spec.rb
spec/lib/gitlab/ci/status/canceled_spec.rb
+1
-1
spec/lib/gitlab/ci/status/created_spec.rb
spec/lib/gitlab/ci/status/created_spec.rb
+1
-1
spec/lib/gitlab/ci/status/failed_spec.rb
spec/lib/gitlab/ci/status/failed_spec.rb
+1
-1
spec/lib/gitlab/ci/status/manual_spec.rb
spec/lib/gitlab/ci/status/manual_spec.rb
+1
-1
spec/lib/gitlab/ci/status/pending_spec.rb
spec/lib/gitlab/ci/status/pending_spec.rb
+1
-1
spec/lib/gitlab/ci/status/running_spec.rb
spec/lib/gitlab/ci/status/running_spec.rb
+1
-1
spec/lib/gitlab/ci/status/skipped_spec.rb
spec/lib/gitlab/ci/status/skipped_spec.rb
+1
-1
spec/lib/gitlab/ci/status/success_spec.rb
spec/lib/gitlab/ci/status/success_spec.rb
+1
-1
spec/lib/gitlab/ci/status/success_warning_spec.rb
spec/lib/gitlab/ci/status/success_warning_spec.rb
+1
-1
No files found.
app/views/ci/status/_badge.html.haml
View file @
e3c7d264
...
@@ -5,9 +5,9 @@
...
@@ -5,9 +5,9 @@
-
if
link
&&
status
.
has_details?
-
if
link
&&
status
.
has_details?
=
link_to
status
.
details_path
,
class:
css_classes
,
title:
title
do
=
link_to
status
.
details_path
,
class:
css_classes
,
title:
title
do
=
custom
_icon
(
status
.
icon
)
=
sprite
_icon
(
status
.
icon
)
=
status
.
text
=
status
.
text
-
else
-
else
%span
{
class:
css_classes
,
title:
title
}
%span
{
class:
css_classes
,
title:
title
}
=
custom
_icon
(
status
.
icon
)
=
sprite
_icon
(
status
.
icon
)
=
status
.
text
=
status
.
text
app/views/ci/status/_dropdown_graph_badge.html.haml
View file @
e3c7d264
...
@@ -7,11 +7,11 @@
...
@@ -7,11 +7,11 @@
-
if
status
.
has_details?
-
if
status
.
has_details?
=
link_to
status
.
details_path
,
class:
'mini-pipeline-graph-dropdown-item'
,
data:
{
toggle:
'tooltip'
,
title:
tooltip
,
container:
'body'
}
do
=
link_to
status
.
details_path
,
class:
'mini-pipeline-graph-dropdown-item'
,
data:
{
toggle:
'tooltip'
,
title:
tooltip
,
container:
'body'
}
do
%span
{
class:
klass
}=
custom
_icon
(
status
.
icon
)
%span
{
class:
klass
}=
sprite
_icon
(
status
.
icon
)
%span
.ci-build-text
=
subject
.
name
%span
.ci-build-text
=
subject
.
name
-
else
-
else
.menu-item.mini-pipeline-graph-dropdown-item
{
data:
{
toggle:
'tooltip'
,
title:
tooltip
,
container:
'body'
}
}
.menu-item.mini-pipeline-graph-dropdown-item
{
data:
{
toggle:
'tooltip'
,
title:
tooltip
,
container:
'body'
}
}
%span
{
class:
klass
}=
custom
_icon
(
status
.
icon
)
%span
{
class:
klass
}=
sprite
_icon
(
status
.
icon
)
%span
.ci-build-text
=
subject
.
name
%span
.ci-build-text
=
subject
.
name
-
if
status
.
has_action?
-
if
status
.
has_action?
...
...
lib/gitlab/ci/status/canceled.rb
View file @
e3c7d264
...
@@ -11,7 +11,7 @@ module Gitlab
...
@@ -11,7 +11,7 @@ module Gitlab
end
end
def
icon
def
icon
'
icon_
status_canceled'
'status_canceled'
end
end
def
favicon
def
favicon
...
...
lib/gitlab/ci/status/created.rb
View file @
e3c7d264
...
@@ -11,7 +11,7 @@ module Gitlab
...
@@ -11,7 +11,7 @@ module Gitlab
end
end
def
icon
def
icon
'
icon_
status_created'
'status_created'
end
end
def
favicon
def
favicon
...
...
lib/gitlab/ci/status/failed.rb
View file @
e3c7d264
...
@@ -11,7 +11,7 @@ module Gitlab
...
@@ -11,7 +11,7 @@ module Gitlab
end
end
def
icon
def
icon
'
icon_
status_failed'
'status_failed'
end
end
def
favicon
def
favicon
...
...
lib/gitlab/ci/status/manual.rb
View file @
e3c7d264
...
@@ -11,7 +11,7 @@ module Gitlab
...
@@ -11,7 +11,7 @@ module Gitlab
end
end
def
icon
def
icon
'
icon_
status_manual'
'status_manual'
end
end
def
favicon
def
favicon
...
...
lib/gitlab/ci/status/pending.rb
View file @
e3c7d264
...
@@ -11,7 +11,7 @@ module Gitlab
...
@@ -11,7 +11,7 @@ module Gitlab
end
end
def
icon
def
icon
'
icon_
status_pending'
'status_pending'
end
end
def
favicon
def
favicon
...
...
lib/gitlab/ci/status/running.rb
View file @
e3c7d264
...
@@ -11,7 +11,7 @@ module Gitlab
...
@@ -11,7 +11,7 @@ module Gitlab
end
end
def
icon
def
icon
'
icon_
status_running'
'status_running'
end
end
def
favicon
def
favicon
...
...
lib/gitlab/ci/status/skipped.rb
View file @
e3c7d264
...
@@ -11,7 +11,7 @@ module Gitlab
...
@@ -11,7 +11,7 @@ module Gitlab
end
end
def
icon
def
icon
'
icon_
status_skipped'
'status_skipped'
end
end
def
favicon
def
favicon
...
...
lib/gitlab/ci/status/success.rb
View file @
e3c7d264
...
@@ -11,7 +11,7 @@ module Gitlab
...
@@ -11,7 +11,7 @@ module Gitlab
end
end
def
icon
def
icon
'
icon_
status_success'
'status_success'
end
end
def
favicon
def
favicon
...
...
lib/gitlab/ci/status/success_warning.rb
View file @
e3c7d264
...
@@ -15,7 +15,7 @@ module Gitlab
...
@@ -15,7 +15,7 @@ module Gitlab
end
end
def
icon
def
icon
'
icon_
status_warning'
'status_warning'
end
end
def
group
def
group
...
...
spec/lib/gitlab/ci/status/canceled_spec.rb
View file @
e3c7d264
...
@@ -14,7 +14,7 @@ describe Gitlab::Ci::Status::Canceled do
...
@@ -14,7 +14,7 @@ describe Gitlab::Ci::Status::Canceled do
end
end
describe
'#icon'
do
describe
'#icon'
do
it
{
expect
(
subject
.
icon
).
to
eq
'
icon_
status_canceled'
}
it
{
expect
(
subject
.
icon
).
to
eq
'status_canceled'
}
end
end
describe
'#favicon'
do
describe
'#favicon'
do
...
...
spec/lib/gitlab/ci/status/created_spec.rb
View file @
e3c7d264
...
@@ -14,7 +14,7 @@ describe Gitlab::Ci::Status::Created do
...
@@ -14,7 +14,7 @@ describe Gitlab::Ci::Status::Created do
end
end
describe
'#icon'
do
describe
'#icon'
do
it
{
expect
(
subject
.
icon
).
to
eq
'
icon_
status_created'
}
it
{
expect
(
subject
.
icon
).
to
eq
'status_created'
}
end
end
describe
'#favicon'
do
describe
'#favicon'
do
...
...
spec/lib/gitlab/ci/status/failed_spec.rb
View file @
e3c7d264
...
@@ -14,7 +14,7 @@ describe Gitlab::Ci::Status::Failed do
...
@@ -14,7 +14,7 @@ describe Gitlab::Ci::Status::Failed do
end
end
describe
'#icon'
do
describe
'#icon'
do
it
{
expect
(
subject
.
icon
).
to
eq
'
icon_
status_failed'
}
it
{
expect
(
subject
.
icon
).
to
eq
'status_failed'
}
end
end
describe
'#favicon'
do
describe
'#favicon'
do
...
...
spec/lib/gitlab/ci/status/manual_spec.rb
View file @
e3c7d264
...
@@ -14,7 +14,7 @@ describe Gitlab::Ci::Status::Manual do
...
@@ -14,7 +14,7 @@ describe Gitlab::Ci::Status::Manual do
end
end
describe
'#icon'
do
describe
'#icon'
do
it
{
expect
(
subject
.
icon
).
to
eq
'
icon_
status_manual'
}
it
{
expect
(
subject
.
icon
).
to
eq
'status_manual'
}
end
end
describe
'#favicon'
do
describe
'#favicon'
do
...
...
spec/lib/gitlab/ci/status/pending_spec.rb
View file @
e3c7d264
...
@@ -14,7 +14,7 @@ describe Gitlab::Ci::Status::Pending do
...
@@ -14,7 +14,7 @@ describe Gitlab::Ci::Status::Pending do
end
end
describe
'#icon'
do
describe
'#icon'
do
it
{
expect
(
subject
.
icon
).
to
eq
'
icon_
status_pending'
}
it
{
expect
(
subject
.
icon
).
to
eq
'status_pending'
}
end
end
describe
'#favicon'
do
describe
'#favicon'
do
...
...
spec/lib/gitlab/ci/status/running_spec.rb
View file @
e3c7d264
...
@@ -14,7 +14,7 @@ describe Gitlab::Ci::Status::Running do
...
@@ -14,7 +14,7 @@ describe Gitlab::Ci::Status::Running do
end
end
describe
'#icon'
do
describe
'#icon'
do
it
{
expect
(
subject
.
icon
).
to
eq
'
icon_
status_running'
}
it
{
expect
(
subject
.
icon
).
to
eq
'status_running'
}
end
end
describe
'#favicon'
do
describe
'#favicon'
do
...
...
spec/lib/gitlab/ci/status/skipped_spec.rb
View file @
e3c7d264
...
@@ -14,7 +14,7 @@ describe Gitlab::Ci::Status::Skipped do
...
@@ -14,7 +14,7 @@ describe Gitlab::Ci::Status::Skipped do
end
end
describe
'#icon'
do
describe
'#icon'
do
it
{
expect
(
subject
.
icon
).
to
eq
'
icon_
status_skipped'
}
it
{
expect
(
subject
.
icon
).
to
eq
'status_skipped'
}
end
end
describe
'#favicon'
do
describe
'#favicon'
do
...
...
spec/lib/gitlab/ci/status/success_spec.rb
View file @
e3c7d264
...
@@ -14,7 +14,7 @@ describe Gitlab::Ci::Status::Success do
...
@@ -14,7 +14,7 @@ describe Gitlab::Ci::Status::Success do
end
end
describe
'#icon'
do
describe
'#icon'
do
it
{
expect
(
subject
.
icon
).
to
eq
'
icon_
status_success'
}
it
{
expect
(
subject
.
icon
).
to
eq
'status_success'
}
end
end
describe
'#favicon'
do
describe
'#favicon'
do
...
...
spec/lib/gitlab/ci/status/success_warning_spec.rb
View file @
e3c7d264
...
@@ -14,7 +14,7 @@ describe Gitlab::Ci::Status::SuccessWarning do
...
@@ -14,7 +14,7 @@ describe Gitlab::Ci::Status::SuccessWarning do
end
end
describe
'#icon'
do
describe
'#icon'
do
it
{
expect
(
subject
.
icon
).
to
eq
'
icon_
status_warning'
}
it
{
expect
(
subject
.
icon
).
to
eq
'status_warning'
}
end
end
describe
'#group'
do
describe
'#group'
do
...
...
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