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
Kazuhiko Shiozaki
gitlab-ce
Commits
145143ac
Commit
145143ac
authored
Mar 10, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed named argument
Set position to auto left so that if it is off-screen it goes to the right
parent
bc19acab
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
app/helpers/ci_status_helper.rb
app/helpers/ci_status_helper.rb
+2
-2
app/views/projects/issues/_merge_requests.html.haml
app/views/projects/issues/_merge_requests.html.haml
+1
-1
No files found.
app/helpers/ci_status_helper.rb
View file @
145143ac
...
@@ -42,12 +42,12 @@ module CiStatusHelper
...
@@ -42,12 +42,12 @@ module CiStatusHelper
icon
(
icon_name
+
' fw'
)
icon
(
icon_name
+
' fw'
)
end
end
def
render_ci_status
(
ci_commit
,
placement:
'
left'
)
def
render_ci_status
(
ci_commit
,
tooltip_placement:
'auto
left'
)
link_to
ci_status_icon
(
ci_commit
),
link_to
ci_status_icon
(
ci_commit
),
ci_status_path
(
ci_commit
),
ci_status_path
(
ci_commit
),
class:
"ci-status-link ci-status-icon-
#{
ci_commit
.
status
.
dasherize
}
"
,
class:
"ci-status-link ci-status-icon-
#{
ci_commit
.
status
.
dasherize
}
"
,
title:
"Build
#{
ci_status_label
(
ci_commit
)
}
"
,
title:
"Build
#{
ci_status_label
(
ci_commit
)
}
"
,
data:
{
toggle:
'tooltip'
,
placement:
placement
}
data:
{
toggle:
'tooltip'
,
placement:
tooltip_
placement
}
end
end
def
no_runners_for_project?
(
project
)
def
no_runners_for_project?
(
project
)
...
...
app/views/projects/issues/_merge_requests.html.haml
View file @
145143ac
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
%li
%li
%span
.merge-request-ci-status
%span
.merge-request-ci-status
-
if
merge_request
.
ci_commit
-
if
merge_request
.
ci_commit
=
render_ci_status
(
merge_request
.
ci_commit
,
placement:
'bottom'
)
=
render_ci_status
(
merge_request
.
ci_commit
)
-
elsif
has_any_ci
-
elsif
has_any_ci
=
icon
(
'blank fw'
)
=
icon
(
'blank fw'
)
%span
.merge-request-id
%span
.merge-request-id
...
...
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