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
iv
gitlab-ce
Commits
6aa43974
Commit
6aa43974
authored
Dec 02, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move subscription info below label info in issue/MR sidebar
parent
89488a7c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
14 deletions
+8
-14
app/views/projects/issues/_discussion.html.haml
app/views/projects/issues/_discussion.html.haml
+0
-7
app/views/projects/merge_requests/_discussion.html.haml
app/views/projects/merge_requests/_discussion.html.haml
+0
-7
app/views/shared/issuable/_context.html.haml
app/views/shared/issuable/_context.html.haml
+8
-0
No files found.
app/views/projects/issues/_discussion.html.haml
View file @
6aa43974
...
@@ -29,10 +29,3 @@
...
@@ -29,10 +29,3 @@
.issuable-affix
.issuable-affix
.context
.context
=
render
'shared/issuable/context'
,
issuable:
@issue
=
render
'shared/issuable/context'
,
issuable:
@issue
-
if
@issue
.
labels
.
any?
.issuable-context-title
%label
Labels
.issue-show-labels
-
@issue
.
labels
.
each
do
|
label
|
=
link_to_label
(
label
)
app/views/projects/merge_requests/_discussion.html.haml
View file @
6aa43974
...
@@ -26,10 +26,3 @@
...
@@ -26,10 +26,3 @@
.issuable-affix
.issuable-affix
.context
.context
=
render
'shared/issuable/context'
,
issuable:
@merge_request
=
render
'shared/issuable/context'
,
issuable:
@merge_request
-
if
@merge_request
.
labels
.
any?
.issuable-context-title
%label
Labels
.merge-request-show-labels
-
@merge_request
.
labels
.
each
do
|
label
|
=
link_to_label
(
label
)
app/views/shared/issuable/_context.html.haml
View file @
6aa43974
...
@@ -29,6 +29,14 @@
...
@@ -29,6 +29,14 @@
=
hidden_field_tag
:issuable_context
=
hidden_field_tag
:issuable_context
=
f
.
submit
class:
'btn hide'
=
f
.
submit
class:
'btn hide'
-
if
issuable
.
labels
.
any?
%div
.prepend-top-default.clearfix
.issuable-context-title
%label
Labels
.merge-request-show-labels
-
issuable
.
labels
.
each
do
|
label
|
=
link_to_label
(
label
)
-
if
current_user
-
if
current_user
-
subscribed
=
issuable
.
subscribed?
(
current_user
)
-
subscribed
=
issuable
.
subscribed?
(
current_user
)
%div
.prepend-top-20.clearfix
%div
.prepend-top-20.clearfix
...
...
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