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
1968191c
Commit
1968191c
authored
Apr 13, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[skip ci] label-info => badge-info
parent
5e546f4b
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
15 additions
and
15 deletions
+15
-15
app/views/admin/runners/_runner.html.haml
app/views/admin/runners/_runner.html.haml
+1
-1
app/views/admin/runners/index.html.haml
app/views/admin/runners/index.html.haml
+1
-1
app/views/profiles/emails/index.html.haml
app/views/profiles/emails/index.html.haml
+4
-4
app/views/projects/branches/_branch.html.haml
app/views/projects/branches/_branch.html.haml
+1
-1
app/views/projects/ci/builds/_build.html.haml
app/views/projects/ci/builds/_build.html.haml
+2
-2
app/views/projects/merge_requests/invalid.html.haml
app/views/projects/merge_requests/invalid.html.haml
+2
-2
app/views/projects/protected_branches/shared/_matching_branch.html.haml
...ects/protected_branches/shared/_matching_branch.html.haml
+1
-1
app/views/projects/protected_branches/shared/_protected_branch.html.haml
...cts/protected_branches/shared/_protected_branch.html.haml
+1
-1
app/views/projects/protected_tags/shared/_matching_tag.html.haml
...ws/projects/protected_tags/shared/_matching_tag.html.haml
+1
-1
app/views/projects/protected_tags/shared/_protected_tag.html.haml
...s/projects/protected_tags/shared/_protected_tag.html.haml
+1
-1
No files found.
app/views/admin/runners/_runner.html.haml
View file @
1968191c
...
...
@@ -3,7 +3,7 @@
-
if
runner
.
shared?
%span
.badge.badge-success
shared
-
else
%span
.badge.
label
-info
specific
%span
.badge.
badge
-info
specific
-
if
runner
.
locked?
%span
.badge.badge-warning
locked
-
unless
runner
.
active?
...
...
app/views/admin/runners/index.html.haml
View file @
1968191c
...
...
@@ -17,7 +17,7 @@
%span
.badge.badge-success
shared
\- Runner runs jobs from all unassigned projects
%li
%span
.badge.
label
-info
specific
%span
.badge.
badge
-info
specific
\- Runner runs jobs from assigned projects
%li
%span
.badge.badge-warning
locked
...
...
app/views/profiles/emails/index.html.haml
View file @
1968191c
...
...
@@ -35,17 +35,17 @@
%span
.float-right
%span
.badge.badge-success
Primary email
-
if
@primary_email
===
current_user
.
public_email
%span
.badge.
label
-info
Public email
%span
.badge.
badge
-info
Public email
-
if
@primary_email
===
current_user
.
notification_email
%span
.badge.
label
-info
Notification email
%span
.badge.
badge
-info
Notification email
-
@emails
.
each
do
|
email
|
%li
=
render
partial:
'shared/email_with_badge'
,
locals:
{
email:
email
.
email
,
verified:
email
.
confirmed?
}
%span
.float-right
-
if
email
.
email
===
current_user
.
public_email
%span
.badge.
label
-info
Public email
%span
.badge.
badge
-info
Public email
-
if
email
.
email
===
current_user
.
notification_email
%span
.badge.
label
-info
Notification email
%span
.badge.
badge
-info
Notification email
-
unless
email
.
confirmed?
-
confirm_title
=
"
#{
email
.
confirmation_sent_at
?
'Resend'
:
'Send'
}
confirmation email"
=
link_to
confirm_title
,
resend_confirmation_instructions_profile_email_path
(
email
),
method: :put
,
class:
'btn btn-sm btn-warning prepend-left-10'
...
...
app/views/projects/branches/_branch.html.haml
View file @
1968191c
...
...
@@ -15,7 +15,7 @@
-
if
branch
.
name
==
@repository
.
root_ref
%span
.badge.badge-primary
default
-
elsif
merged
%span
.badge.
label
-info.has-tooltip
{
title:
s_
(
'
Branches
|
Merged
into
%
{
default_branch
}
'
)
%
{
default_branch:
@repository
.
root_ref
}
}
%span
.badge.
badge
-info.has-tooltip
{
title:
s_
(
'
Branches
|
Merged
into
%
{
default_branch
}
'
)
%
{
default_branch:
@repository
.
root_ref
}
}
=
s_
(
'Branches|merged'
)
-
if
protected_branch?
(
@project
,
branch
)
...
...
app/views/projects/ci/builds/_build.html.haml
View file @
1968191c
...
...
@@ -44,11 +44,11 @@
%span
.badge.badge-primary
=
tag
-
if
job
.
try
(
:trigger_request
)
%span
.badge.
label
-info
triggered
%span
.badge.
badge
-info
triggered
-
if
job
.
try
(
:allow_failure
)
%span
.badge.badge-danger
allowed to fail
-
if
job
.
action?
%span
.badge.
label
-info
manual
%span
.badge.
badge
-info
manual
-
if
pipeline_link
%td
...
...
app/views/projects/merge_requests/invalid.html.haml
View file @
1968191c
...
...
@@ -12,11 +12,11 @@
-
elsif
!
@merge_request
.
source_branch_exists?
%span
.badge.label-inverse
=
@merge_request
.
source_branch
does not exist in
%span
.badge.
label
-info
=
@merge_request
.
source_project_path
%span
.badge.
badge
-info
=
@merge_request
.
source_project_path
-
elsif
!
@merge_request
.
target_branch_exists?
%span
.badge.label-inverse
=
@merge_request
.
target_branch
does not exist in
%span
.badge.
label
-info
=
@merge_request
.
target_project_path
%span
.badge.
badge
-info
=
@merge_request
.
target_project_path
-
else
of internal error
...
...
app/views/projects/protected_branches/shared/_matching_branch.html.haml
View file @
1968191c
...
...
@@ -3,7 +3,7 @@
=
link_to
matching_branch
.
name
,
project_ref_path
(
@project
,
matching_branch
.
name
),
class:
'ref-name'
-
if
@project
.
root_ref?
(
matching_branch
.
name
)
%span
.badge.
label
-info.prepend-left-5
default
%span
.badge.
badge
-info.prepend-left-5
default
%td
-
commit
=
@project
.
commit
(
matching_branch
.
name
)
=
link_to
(
commit
.
short_id
,
project_commit_path
(
@project
,
commit
.
id
),
class:
'commit-sha'
)
...
...
app/views/projects/protected_branches/shared/_protected_branch.html.haml
View file @
1968191c
...
...
@@ -5,7 +5,7 @@
%span
.ref-name
=
protected_branch
.
name
-
if
@project
.
root_ref?
(
protected_branch
.
name
)
%span
.badge.
label
-info.prepend-left-5
default
%span
.badge.
badge
-info.prepend-left-5
default
%td
-
if
protected_branch
.
wildcard?
-
matching_branches
=
protected_branch
.
matching
(
repository
.
branches
)
...
...
app/views/projects/protected_tags/shared/_matching_tag.html.haml
View file @
1968191c
...
...
@@ -3,7 +3,7 @@
=
link_to
matching_tag
.
name
,
project_ref_path
(
@project
,
matching_tag
.
name
),
class:
'ref-name'
-
if
@project
.
root_ref?
(
matching_tag
.
name
)
%span
.badge.
label
-info.prepend-left-5
default
%span
.badge.
badge
-info.prepend-left-5
default
%td
-
commit
=
@project
.
commit
(
matching_tag
.
name
)
=
link_to
(
commit
.
short_id
,
project_commit_path
(
@project
,
commit
.
id
),
class:
'commit-sha'
)
...
...
app/views/projects/protected_tags/shared/_protected_tag.html.haml
View file @
1968191c
...
...
@@ -3,7 +3,7 @@
%span
.ref-name
=
protected_tag
.
name
-
if
@project
.
root_ref?
(
protected_tag
.
name
)
%span
.badge.
label
-info.prepend-left-5
default
%span
.badge.
badge
-info.prepend-left-5
default
%td
-
if
protected_tag
.
wildcard?
-
matching_tags
=
protected_tag
.
matching
(
repository
.
tags
)
...
...
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