glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

little fixes for deploy

Browse source
This commit is contained in:
Connor Turland 2017-02-11 19:50:59 +00:00
parent 2d50f24be6
commit 2d0d0403b1
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/services/follow_service.rb
View file

@ -4,7 +4,7 @@ class FollowService
def self.follow(entity, user, reason) def self.follow(entity, user, reason)
#return unless is_tester(user) return unless is_tester(user)
follow = Follow.where(followed: entity, user: user).first_or_create follow = Follow.where(followed: entity, user: user).first_or_create
if FollowReason::REASONS.include?(reason) && !follow.follow_reason.read_attribute(reason) if FollowReason::REASONS.include?(reason) && !follow.follow_reason.read_attribute(reason)

1
app/views/mailboxer/notification_mailer/new_notification_email.html.erb
View file

@ -2,5 +2,6 @@
<div style="padding: 16px; background: white; text-align: left;"> <div style="padding: 16px; background: white; text-align: left;">
<%= raw @notification.body %> <%= raw @notification.body %>
<p style="font-size: 12px;">Make sense with Metamaps</p> <p style="font-size: 12px;">Make sense with Metamaps</p>
<hr>
<%= render partial: 'shared/mailer_unsubscribe_link' %> <%= render partial: 'shared/mailer_unsubscribe_link' %>
</div> </div>

2
frontend/src/components/NotificationIcon.js
View file

@ -18,7 +18,7 @@ class NotificationIcon extends Component {
} }
return ( return (
<a className={linkClasses} href="/notifications"> <a className={linkClasses} href="/notifications" target="_blank">
<div className="tooltipsUnder"> <div className="tooltipsUnder">
Notifications Notifications
</div> </div>