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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
5c1dba67
Commit
5c1dba67
authored
Mar 10, 2016
by
Robert Speicher
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'issue-mr-build-status-placement' into 'master'
Moves build status tooltip on issues See merge request !3156
parents
e1f9f69c
145143ac
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 @
5c1dba67
...
@@ -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
)
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:
'left'
}
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 @
5c1dba67
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
-
elsif
has_any_ci
-
elsif
has_any_ci
=
icon
(
'blank fw'
)
=
icon
(
'blank fw'
)
%span
.merge-request-id
%span
.merge-request-id
\!
#{
merge_request
.
iid
}
=
merge_request
.
to_reference
%span
.merge-request-info
%span
.merge-request-info
%strong
%strong
=
link_to_gfm
merge_request
.
title
,
merge_request_path
(
merge_request
),
class:
"row_title"
=
link_to_gfm
merge_request
.
title
,
merge_request_path
(
merge_request
),
class:
"row_title"
...
...
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