Merge branch 'fix_subscription' into 'master'

Fix public issue

See merge request !1717

2 files changed, 28 insertions, 26 deletions

diff --git a/app/views/projects/issues/_issue_context.html.haml b/app/views/projects/issues/_issue_context.html.haml
index cb4846a41d1..d43ce0aa293 100644
--- a/app/views/projects/issues/_issue_context.html.haml
+++ b/app/views/projects/issues/_issue_context.html.haml
@@ -27,19 +27,20 @@
       = hidden_field_tag :issue_context
       = f.submit class: 'btn'
 
-  %div.prepend-top-20.clearfix
-    .issuable-context-title
-      %label
-        Subscription:
-    %button.btn.btn-block.subscribe-button
-      %i.fa.fa-eye
-      %span= @issue.subscribed?(current_user) ? "Unsubscribe" : "Subscribe"
-    - subscribtion_status = @issue.subscribed?(current_user) ? "subscribed" : "unsubscribed"
-    .subscription-status{"data-status" => subscribtion_status}
-      .description-block.unsubscribed{class: ( "hidden" if @issue.subscribed?(current_user) )}
-        You're not receiving notifications from this thread.
-      .description-block.subscribed{class: ( "hidden" unless @issue.subscribed?(current_user) )}
-        You're receiving notifications because you're subscribed to this thread.
+  - if current_user
+    %div.prepend-top-20.clearfix
+      .issuable-context-title
+        %label
+          Subscription:
+      %button.btn.btn-block.subscribe-button
+        %i.fa.fa-eye
+        %span= @issue.subscribed?(current_user) ? "Unsubscribe" : "Subscribe"
+      - subscribtion_status = @issue.subscribed?(current_user) ? "subscribed" : "unsubscribed"
+      .subscription-status{"data-status" => subscribtion_status}
+        .description-block.unsubscribed{class: ( "hidden" if @issue.subscribed?(current_user) )}
+          You're not receiving notifications from this thread.
+        .description-block.subscribed{class: ( "hidden" unless @issue.subscribed?(current_user) )}
+          You're receiving notifications because you're subscribed to this thread.
 
 :coffeescript
   $ ->
diff --git a/app/views/projects/merge_requests/show/_context.html.haml b/app/views/projects/merge_requests/show/_context.html.haml
index 753c7e0e611..14ad89a2000 100644
--- a/app/views/projects/merge_requests/show/_context.html.haml
+++ b/app/views/projects/merge_requests/show/_context.html.haml
@@ -29,19 +29,20 @@
         = hidden_field_tag :merge_request_context
         = f.submit class: 'btn'
 
-  %div.prepend-top-20.clearfix
-    .issuable-context-title
-      %label
-        Subscription:
-    %button.btn.btn-block.subscribe-button
-      %i.fa.fa-eye
-      %span= @merge_request.subscribed?(current_user) ? "Unsubscribe" : "Subscribe"
-    - subscribtion_status = @merge_request.subscribed?(current_user) ? "subscribed" : "unsubscribed"
-    .subscription-status{"data-status" => subscribtion_status}
-      .description-block.unsubscribed{class: ( "hidden" if @merge_request.subscribed?(current_user) )}
-        You're not receiving notifications from this thread.
-      .description-block.subscribed{class: ( "hidden" unless @merge_request.subscribed?(current_user) )}
-        You're receiving notifications because you're subscribed to this thread.
+  - if current_user
+    %div.prepend-top-20.clearfix
+      .issuable-context-title
+        %label
+          Subscription:
+      %button.btn.btn-block.subscribe-button
+        %i.fa.fa-eye
+        %span= @merge_request.subscribed?(current_user) ? "Unsubscribe" : "Subscribe"
+      - subscribtion_status = @merge_request.subscribed?(current_user) ? "subscribed" : "unsubscribed"
+      .subscription-status{"data-status" => subscribtion_status}
+        .description-block.unsubscribed{class: ( "hidden" if @merge_request.subscribed?(current_user) )}
+          You're not receiving notifications from this thread.
+        .description-block.subscribed{class: ( "hidden" unless @merge_request.subscribed?(current_user) )}
+          You're receiving notifications because you're subscribed to this thread.
 
 :coffeescript
   $ ->