Merge branch 'fix_subscription' into 'master'

Fix public issue See merge request !1717

Merge branch 'fix_subscription' into 'master'
Fix public issue See merge request !1717
2e2f9d3e · Dmitriy Zaporozhets · Dmitriy Zaporozhets · 2fd9f1cc · 2e2f9d3e · 2e2f9d3e
Commit 2e2f9d3e authored Mar 18, 2015 by Dmitriy Zaporozhets Committed by Dmitriy Zaporozhets Mar 17, 2015
2 changed files
--- a/app/views/projects/issues/_issue_context.html.haml
+++ b/app/views/projects/issues/_issue_context.html.haml
@@ -27,6 +27,7 @@
      = hidden_field_tag :issue_context
      = f.submit class: 'btn'

+  - if current_user
    %div.prepend-top-20.clearfix
      .issuable-context-title
        %label

--- a/app/views/projects/merge_requests/show/_context.html.haml
+++ b/app/views/projects/merge_requests/show/_context.html.haml
@@ -29,6 +29,7 @@
        = hidden_field_tag :merge_request_context
        = f.submit class: 'btn'

+  - if current_user
    %div.prepend-top-20.clearfix
      .issuable-context-title
        %label