diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-02 14:21:23 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-02 14:21:23 +0100 |
| commit | 6aa43974d4bb674f457833ba6f314bbd7c8a2578 (patch) | |
| tree | b1ad76904886ee93914a992b0f1bfb05bfb53ea5 | |
| parent | 89488a7cf930c41028a6e2e842cf0b6b8133e78b (diff) | |
| download | gitlab-ce-6aa43974d4bb674f457833ba6f314bbd7c8a2578.tar.gz | |
Move subscription info below label info in issue/MR sidebar
| -rw-r--r-- | app/views/projects/issues/_discussion.html.haml | 7 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_discussion.html.haml | 7 | ||||
| -rw-r--r-- | app/views/shared/issuable/_context.html.haml | 8 |
3 files changed, 8 insertions, 14 deletions
diff --git a/app/views/projects/issues/_discussion.html.haml b/app/views/projects/issues/_discussion.html.haml index 8f0a1ed9be2..b5f522f2079 100644 --- a/app/views/projects/issues/_discussion.html.haml +++ b/app/views/projects/issues/_discussion.html.haml @@ -29,10 +29,3 @@ .issuable-affix .context = 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) diff --git a/app/views/projects/merge_requests/_discussion.html.haml b/app/views/projects/merge_requests/_discussion.html.haml index 2b3c3eff5e4..00b72e5a1a1 100644 --- a/app/views/projects/merge_requests/_discussion.html.haml +++ b/app/views/projects/merge_requests/_discussion.html.haml @@ -26,10 +26,3 @@ .issuable-affix .context = 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) diff --git a/app/views/shared/issuable/_context.html.haml b/app/views/shared/issuable/_context.html.haml index be66256c7b0..5d00c871080 100644 --- a/app/views/shared/issuable/_context.html.haml +++ b/app/views/shared/issuable/_context.html.haml @@ -29,6 +29,14 @@ = hidden_field_tag :issuable_context = 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 - subscribed = issuable.subscribed?(current_user) %div.prepend-top-20.clearfix |