diff options
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 13 |
1 files changed, 6 insertions, 7 deletions
@@ -8,7 +8,7 @@ gemspec gem 'mocha', '~> 0.14', require: false gem 'rack-cache', '~> 1.2' -gem 'bcrypt-ruby', '~> 3.0.0' +gem 'bcrypt-ruby', '~> 3.1.0' gem 'jquery-rails', '~> 2.2.0' gem 'turbolinks' gem 'coffee-rails', '~> 4.0.0' @@ -56,18 +56,17 @@ platforms :ruby do group :db do gem 'pg', '>= 0.11.0' gem 'mysql', '>= 2.9.0' - - # TODO: Relax dependency version after of fix #11457 - gem 'mysql2', '0.3.11' + gem 'mysql2', '>= 0.3.13' end end platforms :jruby do - gem 'activerecord-jdbcsqlite3-adapter', '>= 1.2.7' + gem 'json' + gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0' group :db do - gem 'activerecord-jdbcmysql-adapter', '>= 1.2.7' - gem 'activerecord-jdbcpostgresql-adapter', '>= 1.2.7' + gem 'activerecord-jdbcmysql-adapter', '>= 1.3.0' + gem 'activerecord-jdbcpostgresql-adapter', '>= 1.3.0' end end |