From 926556c145f43638208dd681c0f7b8b772640ff2 Mon Sep 17 00:00:00 2001 From: Florian Staudacher Date: Thu, 18 Sep 2014 22:30:28 +0200 Subject: [PATCH 1/2] fix profile badge too much margin [ci skip] --- app/assets/stylesheets/profile.css.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/assets/stylesheets/profile.css.scss b/app/assets/stylesheets/profile.css.scss index de1dfe8cc..bf2338591 100644 --- a/app/assets/stylesheets/profile.css.scss +++ b/app/assets/stylesheets/profile.css.scss @@ -13,6 +13,8 @@ padding: 0; } + .avatar.large { margin-bottom: 0; } + ul#profile_information { margin: 1em 0; > li { From 93c6159c56aef7a5d4e1b78b8a35601c86905aab Mon Sep 17 00:00:00 2001 From: "taro@diasporajp" Date: Fri, 19 Sep 2014 16:33:55 +0900 Subject: [PATCH 2/2] fix locale of invitation email subject #5231 --- app/mailers/notifier.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/mailers/notifier.rb b/app/mailers/notifier.rb index 00dd5e109..e92795a18 100644 --- a/app/mailers/notifier.rb +++ b/app/mailers/notifier.rb @@ -43,11 +43,11 @@ class Notifier < ActionMailer::Base @locale = locale @invitation_code = invitation_code - mail_opts = {:to => email, :from => AppConfig.mail.sender_address, + I18n.with_locale(locale) do + mail_opts = {:to => email, :from => AppConfig.mail.sender_address, :subject => I18n.t('notifier.invited_you', :name => @inviter.name), :host => AppConfig.pod_uri.host} - I18n.with_locale(locale) do mail(mail_opts) do |format| format.text { render :layout => nil } format.html { render :layout => nil }