Merge remote-tracking branch 'origin/master'

Weblate
2 parents cc512971 fb48ecc5
Showing 2 changed files with 2 additions and 1 deletions Show diff stats
Gemfile
config/initializers/jrails.rb
@@ -18,7 +18,7 @@ gem &#39;exception_notification&#39;,   &#39;~&gt; 4.0.1&#39;
 gem 'gettext',                  '~> 2.2.1', :require => false, :group => :development
 gem 'locale',                   '~> 2.0.5'
 gem 'whenever', :require => false
-gem 'eita-jrails'
+gem 'eita-jrails', :require => false
  
 group :production do
   gem 'dalli', '~> 2.7.0'
@@ -0,0 +1 @@
+require 'jrails'
...	...	@@ -18,7 +18,7 @@ gem 'exception_notification', '~> 4.0.1'
18	18	gem 'gettext', '~> 2.2.1', :require => false, :group => :development
19	19	gem 'locale', '~> 2.0.5'
20	20	gem 'whenever', :require => false
21		-gem 'eita-jrails'
	21	+gem 'eita-jrails', :require => false
22	22
23	23	group :production do
24	24	gem 'dalli', '~> 2.7.0'
...	...