diff --git a/Gemfile b/Gemfile index b86d9ec..0e3e75e 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ require File.expand_path('../lib/regexp_extensions', FOREMAN_GEMFILE) source 'https://rubygems.org' -gem 'rails', '3.2.18' +gem 'rails', '3.2.22.2' gem 'json' gem 'rest-client', '> 1.6.2', '< 1.7', :require => 'rest_client' gem "audited-activerecord", "3.0.0" @@ -34,8 +34,9 @@ if RUBY_VERSION =~ /^1\.8/ gem 'rake', '< 10.2.0' else # Newer version of safemode contains fixes for Ruby 1.9 - gem 'safemode', '~> 1.2.1' - gem 'ruby_parser', '~> 3.0.0' + gem 'test-unit', '~> 3.1.7' + gem 'safemode', '~> 1.2.2' + gem 'ruby_parser', '~> 3.2.0' end Dir["#{File.dirname(FOREMAN_GEMFILE)}/bundler.d/*.rb"].each do |bundle| diff --git a/bundler.d/assets.rb b/bundler.d/assets.rb index 2319190..b525fbd 100644 --- a/bundler.d/assets.rb +++ b/bundler.d/assets.rb @@ -4,7 +4,7 @@ group :assets do gem 'execjs', '< 2.1.0' gem "jquery-rails", "2.0.3" gem 'jquery-ui-rails', '< 5.0.0' - gem "therubyracer", '0.11.3', :require => 'v8' + gem "therubyracer", '0.11.3' gem 'bootstrap-sass', '~> 3.0.3.0' gem "spice-html5-rails" gem "flot-rails", '0.0.3' diff --git a/bundler.d/i18n.rb b/bundler.d/i18n.rb index a5847d4..29d6a8c 100644 --- a/bundler.d/i18n.rb +++ b/bundler.d/i18n.rb @@ -3,4 +3,5 @@ group :i18n do gem 'gettext_i18n_rails', '~> 0.10' gem 'gettext_i18n_rails_js', '>= 0.0.8' gem 'i18n_data', '>= 0.2.6', :require => 'i18n_data' + gem 'i18n', '~> 0.6.11' end diff --git a/bundler.d/mysql2.rb b/bundler.d/mysql2.rb index 44fe73f..3069dab 100644 --- a/bundler.d/mysql2.rb +++ b/bundler.d/mysql2.rb @@ -1,3 +1,3 @@ group :mysql2 do - gem 'mysql2', '> 0.3.0' + gem 'mysql2', '~> 0.3.20' end diff --git a/bundler.d/fog.rb b/bundler.d/fog.rb index 596555e..7edcd8c 100644 --- a/bundler.d/fog.rb +++ b/bundler.d/fog.rb @@ -1,5 +1,5 @@ group :fog do - gem 'fog', '~> 1.23.0' - gem 'fog-core', '~> 1.23.0' + gem 'fog', '~> 1.25.0' + gem 'fog-core', '~> 1.25.0' gem 'unf' end