diff --git a/Gemfile b/Gemfile index 72ba5cb7..2b8aab3b 100644 --- a/Gemfile +++ b/Gemfile @@ -30,9 +30,7 @@ gem 'devise-i18n' gem 'http_accept_language' gem 'rails-i18n' # Store some specific content, like application name and static pages contents -gem 'i18n-active_record', - github: 'svenfuchs/i18n-active_record', - require: 'i18n/active_record' +gem 'i18n-active_record', require: 'i18n/active_record' # Remove leading and trailing white spaces gem 'strip_attributes' # Track changes to models' data diff --git a/Gemfile.lock b/Gemfile.lock index 76241879..acc79efb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,3 @@ -GIT - remote: git://github.com/svenfuchs/i18n-active_record.git - revision: a61b6840b746d303de17f12d35522388c16ad003 - specs: - i18n-active_record (0.2.0) - i18n (>= 0.5.0) - GEM remote: https://rubygems.org/ remote: https://rails-assets.org/ @@ -74,7 +67,7 @@ GEM brakeman (3.7.0) buftok (0.2.0) builder (3.2.3) - bundler-audit (0.5.0) + bundler-audit (0.6.0) bundler (~> 1.2) thor (~> 0.18) byebug (9.0.6) @@ -192,6 +185,8 @@ GEM http_accept_language (2.1.1) http_parser.rb (0.6.0) i18n (0.8.6) + i18n-active_record (0.2.0) + i18n (>= 0.5.0) ice_cube (0.16.2) inherited_resources (1.7.2) actionpack (>= 3.2, < 5.2.x) @@ -336,8 +331,8 @@ GEM unicode-display_width (~> 1.0, >= 1.0.1) ruby-progressbar (1.8.1) ruby_dep (1.5.0) - ruby_parser (3.9.0) - sexp_processor (~> 4.1) + ruby_parser (3.10.0) + sexp_processor (~> 4.9) sass (3.5.1) sass-listen (~> 4.0.0) sass-listen (4.0.0) @@ -352,7 +347,7 @@ GEM sdoc (0.4.2) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) - sexp_processor (4.9.0) + sexp_processor (4.10.0) shellany (0.0.1) simple_calendar (2.2.6) rails (>= 3.0) @@ -446,7 +441,7 @@ DEPENDENCIES has_scope (< 0.7) high_voltage http_accept_language - i18n-active_record! + i18n-active_record ice_cube jbuilder jquery-rails