diff --git a/Gemfile b/Gemfile index ddcaf172c1..d305e53645 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" } gem 'i18n', '~> 0.6.11' gem 'i18n-js', '~> 3.6.0' gem 'rails', '~> 4.0.0' -# gem 'rails-i18n', '~> 4.0' +gem 'rails-i18n', '~> 4.0' gem 'rails_safe_tasks', '~> 1.0' gem "activerecord-import" diff --git a/Gemfile.lock b/Gemfile.lock index 2b5aff6310..b491a1547c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -584,7 +584,6 @@ GEM rubocop-rails (2.4.2) rack (>= 1.1) rubocop (>= 0.72.0) - ruby-ole (1.2.12.2) ruby-progressbar (1.10.1) ruby-rc4 (0.1.5) rubyzip (1.3.0) @@ -627,9 +626,9 @@ GEM state_machine (1.2.0) stringex (1.5.1) stripe (5.11.0) - test-unit (3.3.5) temple (0.8.2) power_assert + test-unit (3.3.5) thor (0.20.3) thread_safe (0.3.6) tilt (1.4.1) @@ -742,6 +741,7 @@ DEPENDENCIES rack-rewrite rack-ssl rails (~> 4.0.0) + rails-i18n (~> 4.0) rails_safe_tasks (~> 1.0) redcarpet roadie-rails (~> 1.3.0) @@ -750,7 +750,7 @@ DEPENDENCIES rspec-retry rubocop rubocop-rails - sass-rails (~> 3.2.3) + sass-rails select2-rails (~> 3.4.7) selenium-webdriver shoulda-matchers