logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 7b10794afb07c09719756d430c29b9d2e96cffac
parent: 355965c17b8b27fa2cdaa46962fef1644036f2ae
Author: Hiromi Kai <pie05041008@gmail.com>
Date:   Sat, 15 Apr 2017 20:32:53 +0900

Add rails-i18n gem (#1837)


Diffstat:

MGemfile1+
MGemfile.lock4++++
2 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/Gemfile b/Gemfile @@ -44,6 +44,7 @@ gem 'rabl' gem 'rack-attack' gem 'rack-cors', require: 'rack/cors' gem 'rack-timeout' +gem 'rails-i18n' gem 'rails-settings-cached' gem 'redis', '~>3.2', require: ['redis', 'redis/connection/hiredis'] gem 'rqrcode' diff --git a/Gemfile.lock b/Gemfile.lock @@ -319,6 +319,9 @@ GEM nokogiri (~> 1.6) rails-html-sanitizer (1.0.3) loofah (~> 2.0) + rails-i18n (5.0.3) + i18n (~> 0.7) + railties (~> 5.0) rails-settings-cached (0.6.5) rails (>= 4.2.0) rails_12factor (0.0.3) @@ -521,6 +524,7 @@ DEPENDENCIES rack-timeout rails (~> 5.0.2) rails-controller-testing + rails-i18n rails-settings-cached rails_12factor react-rails