Commit dbd347bf authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'fix_subscription' into 'master'

Fix public issue

See merge request !1717
parents 63d0bf1f 847bd0d0
...@@ -27,19 +27,20 @@ ...@@ -27,19 +27,20 @@
= hidden_field_tag :issue_context = hidden_field_tag :issue_context
= f.submit class: 'btn' = f.submit class: 'btn'
%div.prepend-top-20.clearfix - if current_user
.issuable-context-title %div.prepend-top-20.clearfix
%label .issuable-context-title
Subscription: %label
%button.btn.btn-block.subscribe-button Subscription:
%i.fa.fa-eye %button.btn.btn-block.subscribe-button
%span= @issue.subscribed?(current_user) ? "Unsubscribe" : "Subscribe" %i.fa.fa-eye
- subscribtion_status = @issue.subscribed?(current_user) ? "subscribed" : "unsubscribed" %span= @issue.subscribed?(current_user) ? "Unsubscribe" : "Subscribe"
.subscription-status{"data-status" => subscribtion_status} - subscribtion_status = @issue.subscribed?(current_user) ? "subscribed" : "unsubscribed"
.description-block.unsubscribed{class: ( "hidden" if @issue.subscribed?(current_user) )} .subscription-status{"data-status" => subscribtion_status}
You're not receiving notifications from this thread. .description-block.unsubscribed{class: ( "hidden" if @issue.subscribed?(current_user) )}
.description-block.subscribed{class: ( "hidden" unless @issue.subscribed?(current_user) )} You're not receiving notifications from this thread.
You're receiving notifications because you're subscribed to this thread. .description-block.subscribed{class: ( "hidden" unless @issue.subscribed?(current_user) )}
You're receiving notifications because you're subscribed to this thread.
:coffeescript :coffeescript
$ -> $ ->
......
...@@ -29,19 +29,20 @@ ...@@ -29,19 +29,20 @@
= hidden_field_tag :merge_request_context = hidden_field_tag :merge_request_context
= f.submit class: 'btn' = f.submit class: 'btn'
%div.prepend-top-20.clearfix - if current_user
.issuable-context-title %div.prepend-top-20.clearfix
%label .issuable-context-title
Subscription: %label
%button.btn.btn-block.subscribe-button Subscription:
%i.fa.fa-eye %button.btn.btn-block.subscribe-button
%span= @merge_request.subscribed?(current_user) ? "Unsubscribe" : "Subscribe" %i.fa.fa-eye
- subscribtion_status = @merge_request.subscribed?(current_user) ? "subscribed" : "unsubscribed" %span= @merge_request.subscribed?(current_user) ? "Unsubscribe" : "Subscribe"
.subscription-status{"data-status" => subscribtion_status} - subscribtion_status = @merge_request.subscribed?(current_user) ? "subscribed" : "unsubscribed"
.description-block.unsubscribed{class: ( "hidden" if @merge_request.subscribed?(current_user) )} .subscription-status{"data-status" => subscribtion_status}
You're not receiving notifications from this thread. .description-block.unsubscribed{class: ( "hidden" if @merge_request.subscribed?(current_user) )}
.description-block.subscribed{class: ( "hidden" unless @merge_request.subscribed?(current_user) )} You're not receiving notifications from this thread.
You're receiving notifications because you're subscribed to 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 :coffeescript
$ -> $ ->
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment