Commit be084908 authored by Zeger-Jan van de Weg's avatar Zeger-Jan van de Weg

#can_unsubscribe? -> #?unsubscribable?

parent 26cedc7e
...@@ -3,7 +3,7 @@ class SentNotificationsController < ApplicationController ...@@ -3,7 +3,7 @@ class SentNotificationsController < ApplicationController
def unsubscribe def unsubscribe
@sent_notification = SentNotification.for(params[:id]) @sent_notification = SentNotification.for(params[:id])
return render_404 unless @sent_notification && @sent_notification.can_unsubscribe? return render_404 unless @sent_notification && @sent_notification.unsubscribable?
noteable = @sent_notification.noteable noteable = @sent_notification.noteable
noteable.unsubscribe(@sent_notification.recipient) noteable.unsubscribe(@sent_notification.recipient)
......
...@@ -62,7 +62,7 @@ class SentNotification < ActiveRecord::Base ...@@ -62,7 +62,7 @@ class SentNotification < ActiveRecord::Base
end end
end end
def can_unsubscribe? def unsubscribable?
!for_commit? !for_commit?
end end
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
-# Don't link the host is the line below, one link in the email is easier to quickly click than two. -# Don't link the host is the line below, one link in the email is easier to quickly click than two.
You're receiving this email because of your account on #{Gitlab.config.gitlab.host}. You're receiving this email because of your account on #{Gitlab.config.gitlab.host}.
If you'd like to receive fewer emails, you can If you'd like to receive fewer emails, you can
- if @sent_notification && @sent_notification.can_unsubscribe? - if @sent_notification && @sent_notification.unsubscribable?
= link_to "unsubscribe", unsubscribe_sent_notification_url(@sent_notification) = link_to "unsubscribe", unsubscribe_sent_notification_url(@sent_notification)
from this thread or from this thread or
adjust your notification settings. adjust your notification settings.
......
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