Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2015-03-16 18:20:17 +0300
committerValery Sizov <vsv2711@gmail.com>2015-03-16 22:38:41 +0300
commit1b437ec3498bc544dbd1b252f5c755e9073407fd (patch)
treee3c0cea66260a2b65d21b660ebd4b042a6b0c80c /app/views/projects/merge_requests
parentf53683e67fa0db7b13d0dee977bc21206af7e0fd (diff)
tests
Diffstat (limited to 'app/views/projects/merge_requests')
-rw-r--r--app/views/projects/merge_requests/show/_context.html.haml6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/merge_requests/show/_context.html.haml b/app/views/projects/merge_requests/show/_context.html.haml
index d0c00c1aeaf..79b0e7799a9 100644
--- a/app/views/projects/merge_requests/show/_context.html.haml
+++ b/app/views/projects/merge_requests/show/_context.html.haml
@@ -35,12 +35,12 @@
Subscription:
%i.fa.fa-spinner.fa-spin.hidden.subscription
%span.sub_status
- = @merge_request.subscription_status(current_user) ? "subscribed" : "unsubscribed"
- - subscribe_action = @merge_request.subscription_status(current_user) ? "Unsubscribe" : "Subscribe"
+ = @merge_request.subscribed?(current_user) ? "subscribed" : "unsubscribed"
+ - subscribe_action = @merge_request.subscribed?(current_user) ? "Unsubscribe" : "Subscribe"
%input.btn.subscribe-button{:type => "button", :value => subscribe_action}
:coffeescript
$ ->
- new Subscription("#{set_subscription_namespace_project_issue_path(@merge_request.project.namespace, @project, @merge_request)}")
+ new Subscription("#{toggle_subscription_namespace_project_merge_request_path(@merge_request.project.namespace, @project, @merge_request)}")
\ No newline at end of file