From f50459000a2b28d38134495e2c3b81a2e3aba1f9 Mon Sep 17 00:00:00 2001 From: Arun Agrawal Date: Sat, 15 Jun 2013 13:05:07 +0200 Subject: 'json' gem is no more required under JRuby --- Gemfile | 1 - 1 file changed, 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index b0f91c6dac..13bee8ee5e 100644 --- a/Gemfile +++ b/Gemfile @@ -61,7 +61,6 @@ platforms :ruby do end platforms :jruby do - gem 'json' gem 'activerecord-jdbcsqlite3-adapter', '>= 1.2.7' group :db do -- cgit v1.2.3 From 8df284a0e9fd075a7e77cbb578532950148d0f24 Mon Sep 17 00:00:00 2001 From: Guillermo Iguaran Date: Tue, 16 Jul 2013 02:27:03 -0500 Subject: Lock mysql2 version to 0.3.11 since 0.3.12 is failing right now. Check #11457 for details --- Gemfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 13bee8ee5e..748d287b20 100644 --- a/Gemfile +++ b/Gemfile @@ -56,7 +56,9 @@ platforms :ruby do group :db do gem 'pg', '>= 0.11.0' gem 'mysql', '>= 2.9.0' - gem 'mysql2', '>= 0.3.10' + + # TODO: Relax dependency version after of fix #11457 + gem 'mysql2', '0.3.11' end end -- cgit v1.2.3 From ad62cf68f89506b0a5074fec8e08d104865aa0ee Mon Sep 17 00:00:00 2001 From: Burkhard Vogel-Kreykenbohm Date: Wed, 17 Jul 2013 11:49:47 +0200 Subject: bcrypt-ruby stable is 3.1 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 748d287b20..d40e36360d 100644 --- a/Gemfile +++ b/Gemfile @@ -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' -- cgit v1.2.3 From d97269dac70155be19b0a1ee4e1d988988aaebdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20=C5=A0im=C3=A1nek?= Date: Thu, 18 Jul 2013 00:43:55 +0200 Subject: Use latest mysql2. Fixes #11457 --- Gemfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index d40e36360d..0ab41ec445 100644 --- a/Gemfile +++ b/Gemfile @@ -56,9 +56,7 @@ 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 -- cgit v1.2.3 From 53d682b1320828d9a0ec31431d1ab54cae03753c Mon Sep 17 00:00:00 2001 From: Gaurish Sharma Date: Mon, 12 Aug 2013 01:43:26 +0530 Subject: Upgrade ActiveRecord-JDBC-Adapter to master branch Switch to master branch which provides Version 1.3.x of AR-JDBC adapter. It strives to provide ActiveRecord 4.x compatibility (as well as still supporting 2.3 and 3.x) from a single code base. It's a recommended update for all AR-JDBC 1.2.x users. --- Gemfile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 0ab41ec445..cff6ae4dec 100644 --- a/Gemfile +++ b/Gemfile @@ -61,12 +61,13 @@ platforms :ruby do end platforms :jruby do - gem 'activerecord-jdbcsqlite3-adapter', '>= 1.2.7' - - group :db do - gem 'activerecord-jdbcmysql-adapter', '>= 1.2.7' - gem 'activerecord-jdbcpostgresql-adapter', '>= 1.2.7' - end + git 'git://github.com/jruby/activerecord-jdbc-adapter.git' do + gem 'activerecord-jdbcsqlite3-adapter' + group :db do + gem 'activerecord-jdbcmysql-adapter' + gem 'activerecord-jdbcpostgresql-adapter' + end + end end # gems that are necessary for ActiveRecord tests with Oracle database -- cgit v1.2.3 From 3ec6cc70f34a553d36c778731105d3351ccc6bef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Tue, 20 Aug 2013 15:31:43 -0300 Subject: Fix the indentation :scissors: --- Gemfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index cff6ae4dec..d703a2e404 100644 --- a/Gemfile +++ b/Gemfile @@ -61,13 +61,13 @@ platforms :ruby do end platforms :jruby do - git 'git://github.com/jruby/activerecord-jdbc-adapter.git' do - gem 'activerecord-jdbcsqlite3-adapter' - group :db do - gem 'activerecord-jdbcmysql-adapter' - gem 'activerecord-jdbcpostgresql-adapter' - end + git 'git://github.com/jruby/activerecord-jdbc-adapter.git' do + gem 'activerecord-jdbcsqlite3-adapter' + group :db do + gem 'activerecord-jdbcmysql-adapter' + gem 'activerecord-jdbcpostgresql-adapter' end + end end # gems that are necessary for ActiveRecord tests with Oracle database -- cgit v1.2.3 From 160e0786a32d9dcf62be8f7882998d11d8b6c3cf Mon Sep 17 00:00:00 2001 From: Kassio Borges Date: Sat, 31 Aug 2013 12:54:37 -0300 Subject: upgrade jruby dependencies --- Gemfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index d703a2e404..7ac743cbd6 100644 --- a/Gemfile +++ b/Gemfile @@ -61,12 +61,12 @@ platforms :ruby do end platforms :jruby do - git 'git://github.com/jruby/activerecord-jdbc-adapter.git' do - gem 'activerecord-jdbcsqlite3-adapter' - group :db do - gem 'activerecord-jdbcmysql-adapter' - gem 'activerecord-jdbcpostgresql-adapter' - end + gem 'json' + gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0' + + group :db do + gem 'activerecord-jdbcmysql-adapter', '>= 1.3.0' + gem 'activerecord-jdbcpostgresql-adapter', '>= 1.3.0' end end -- cgit v1.2.3 From 0a4683055dbc1d80d7f8680bddc462c6bd3e4e3a Mon Sep 17 00:00:00 2001 From: kares Date: Tue, 3 Sep 2013 08:33:00 +0200 Subject: allow to test AR master against AR-JDBC master (with `ENV['AR_JDBC']`) --- Gemfile | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 7ac743cbd6..94eec28867 100644 --- a/Gemfile +++ b/Gemfile @@ -62,11 +62,18 @@ end platforms :jruby do gem 'json' - gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0' - - group :db do - gem 'activerecord-jdbcmysql-adapter', '>= 1.3.0' - gem 'activerecord-jdbcpostgresql-adapter', '>= 1.3.0' + if ENV['AR_JDBC'] + gem 'activerecord-jdbcsqlite3-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'master' + group :db do + gem 'activerecord-jdbcmysql-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'master' + gem 'activerecord-jdbcpostgresql-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'master' + end + else + gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0' + group :db do + gem 'activerecord-jdbcmysql-adapter', '>= 1.3.0' + gem 'activerecord-jdbcpostgresql-adapter', '>= 1.3.0' + end end end -- cgit v1.2.3 From 4a99e1019931481011c621fe89f715fe6dac9dd3 Mon Sep 17 00:00:00 2001 From: "T.J. Schuck" Date: Mon, 23 Sep 2013 14:28:26 -0400 Subject: bcrypt-ruby v3.1.2 supports Ruby 2.0 on Windows --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 7ac743cbd6..60c571f782 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gemspec gem 'mocha', '~> 0.14', require: false gem 'rack-cache', '~> 1.2' -gem 'bcrypt-ruby', '~> 3.1.0' +gem 'bcrypt-ruby', '~> 3.1.2' gem 'jquery-rails', '~> 2.2.0' gem 'turbolinks' gem 'coffee-rails', '~> 4.0.0' -- cgit v1.2.3 From dc8a20677d820aa09413c6a3e25c9d70ba24561a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Tue, 22 Oct 2013 20:01:26 -0200 Subject: Try arel master Conflicts: Gemfile --- Gemfile | 1 + 1 file changed, 1 insertion(+) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 60c571f782..2b79c25b11 100644 --- a/Gemfile +++ b/Gemfile @@ -12,6 +12,7 @@ gem 'bcrypt-ruby', '~> 3.1.2' gem 'jquery-rails', '~> 2.2.0' gem 'turbolinks' gem 'coffee-rails', '~> 4.0.0' +gem 'arel', github: 'rails/arel' # This needs to be with require false to avoid # it being automatically loaded by sprockets -- cgit v1.2.3 From 6bb56b2c1919d4cd20b7c3b8cf28989786d635bc Mon Sep 17 00:00:00 2001 From: Federico Ravasio Date: Thu, 31 Oct 2013 21:11:42 +0100 Subject: Added Rubinius 2 specific dependencies. --- Gemfile | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index fbb0e0fd49..d4bbe007df 100644 --- a/Gemfile +++ b/Gemfile @@ -78,6 +78,12 @@ platforms :jruby do end end +platforms :rbx do + gem 'psych' + gem 'rubysl-mathn' + gem 'rubysl-matrix' +end + # gems that are necessary for ActiveRecord tests with Oracle database if ENV['ORACLE_ENHANCED'] platforms :ruby do -- cgit v1.2.3 From ae27dd6affe41d063e076ad91694d37e458e182f Mon Sep 17 00:00:00 2001 From: Federico Ravasio Date: Fri, 1 Nov 2013 11:25:10 +0100 Subject: Added rubysl-rexml to Rubinius deps. --- Gemfile | 1 + 1 file changed, 1 insertion(+) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index d4bbe007df..ee27f23137 100644 --- a/Gemfile +++ b/Gemfile @@ -82,6 +82,7 @@ platforms :rbx do gem 'psych' gem 'rubysl-mathn' gem 'rubysl-matrix' + gem 'rubysl-rexml' end # gems that are necessary for ActiveRecord tests with Oracle database -- cgit v1.2.3 From c10a78124c1c32f8ce3a92888863b9b258efcc06 Mon Sep 17 00:00:00 2001 From: Arun Agrawal Date: Fri, 1 Nov 2013 10:39:06 +0100 Subject: More Warnings removed for ruby trunk Same as 4d4ff531b8807ee88a3fc46875c7e76f613956fb --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index ee27f23137..e82b4c2b27 100644 --- a/Gemfile +++ b/Gemfile @@ -30,7 +30,7 @@ gem 'dalli', '>= 2.2.1' # Add your own local bundler stuff local_gemfile = File.dirname(__FILE__) + "/.Gemfile" -instance_eval File.read local_gemfile if File.exists? local_gemfile +instance_eval File.read local_gemfile if File.exist? local_gemfile group :test do platforms :mri_19 do -- cgit v1.2.3 From 11673a7977f6044a87139ae630c391e58bb5d757 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Thu, 14 Nov 2013 23:21:56 -0200 Subject: Set branch for arel in Gemfile so that we can use bundle local config [ci skip] --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index e82b4c2b27..848bf41f44 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ gem 'bcrypt-ruby', '~> 3.1.2' gem 'jquery-rails', '~> 2.2.0' gem 'turbolinks' gem 'coffee-rails', '~> 4.0.0' -gem 'arel', github: 'rails/arel' +gem 'arel', github: 'rails/arel', branch: 'master' # This needs to be with require false to avoid # it being automatically loaded by sprockets -- cgit v1.2.3 From 3053fee954c1e28b23f7e00921d7b9b3b3867fa5 Mon Sep 17 00:00:00 2001 From: Yves Senn Date: Tue, 19 Nov 2013 14:16:45 +0100 Subject: use `4-0-stable` arel branch to get bundle working again. this resolves the following error when running `bundle install` ``` ArgumentError: wrong number of arguments (2 for 1) /Users/senny/Projects/rails/.bundle/bundler/gems/arel-454a25f18c95/lib/arel/crud.rb:5:in `compile_update' ``` The build is still broken with lots of: ``` ArgumentError: wrong number of arguments (2 for 1) /Users/senny/Projects/rails/.bundle/bundler/gems/arel-454a25f18c95/lib/arel/crud.rb:5:in `compile_update' ``` --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 848bf41f44..46e5ead042 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ gem 'bcrypt-ruby', '~> 3.1.2' gem 'jquery-rails', '~> 2.2.0' gem 'turbolinks' gem 'coffee-rails', '~> 4.0.0' -gem 'arel', github: 'rails/arel', branch: 'master' +gem 'arel', github: 'rails/arel', branch: '4-0-stable' # This needs to be with require false to avoid # it being automatically loaded by sprockets -- cgit v1.2.3 From a6f58a535ee4647b541988c5a0c8a98b9c6c4249 Mon Sep 17 00:00:00 2001 From: Yves Senn Date: Tue, 19 Nov 2013 15:33:42 +0100 Subject: use arel `master` and update activerecord to depend on arel `5.0.0`. This is a follow-up to 3053fee954c1e28b23f7e00921d7b9b3b3867fa5. > The `master` branch should use the `master` branch. --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 46e5ead042..e82b4c2b27 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ gem 'bcrypt-ruby', '~> 3.1.2' gem 'jquery-rails', '~> 2.2.0' gem 'turbolinks' gem 'coffee-rails', '~> 4.0.0' -gem 'arel', github: 'rails/arel', branch: '4-0-stable' +gem 'arel', github: 'rails/arel' # This needs to be with require false to avoid # it being automatically loaded by sprockets -- cgit v1.2.3 From 5541cdcf886072f59d847f6b880db7d57047aec2 Mon Sep 17 00:00:00 2001 From: Federico Ravasio Date: Sun, 24 Nov 2013 13:59:22 +0100 Subject: Properly fix Rubinius dependencies in Gemfile & Travis integration. Before Rubinius 2.2.0, some parts of the stdlib were lazily loaded, even if not included in the Gemfile. Now it's 100% required to include the gem 'rubysl', otherwise the stdlib is not available entirely, breaking everything. Also, the rubysl-test-unit gem was depending on minitest ~> 4.7, thus causing conflicts with Rails's dependency on minitest 5. That is not the case anymore since rubysl-test-unit 2.0.2, so it is completely safe to include it fully. When Travis is going to update RVM to 1.24, it'll be safe to use rbx-2, thus picking new versions automatically. --- Gemfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index e82b4c2b27..1422da2723 100644 --- a/Gemfile +++ b/Gemfile @@ -79,10 +79,8 @@ platforms :jruby do end platforms :rbx do - gem 'psych' - gem 'rubysl-mathn' - gem 'rubysl-matrix' - gem 'rubysl-rexml' + gem 'psych', '~> 2.0' + gem 'rubysl', '~> 2.0' end # gems that are necessary for ActiveRecord tests with Oracle database -- cgit v1.2.3 From 42c28544e1b8a650fd9d6d4cae12acb25fbd5905 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Tue, 26 Nov 2013 13:52:53 -0200 Subject: Add branch to arel in Gemfile so that we can use local repos [ci skip] --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 1422da2723..6df67bda65 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ gem 'bcrypt-ruby', '~> 3.1.2' gem 'jquery-rails', '~> 2.2.0' gem 'turbolinks' gem 'coffee-rails', '~> 4.0.0' -gem 'arel', github: 'rails/arel' +gem 'arel', github: 'rails/arel', branch: 'master' # This needs to be with require false to avoid # it being automatically loaded by sprockets -- cgit v1.2.3 From 1a09ceeea87e05055979b6fd9adaa1dfac770789 Mon Sep 17 00:00:00 2001 From: Godfrey Chan Date: Tue, 26 Nov 2013 22:12:06 -0800 Subject: Dropped yajl from Gemfile --- Gemfile | 1 - 1 file changed, 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 6df67bda65..e1278e6fdf 100644 --- a/Gemfile +++ b/Gemfile @@ -45,7 +45,6 @@ group :test do end platforms :ruby do - gem 'yajl-ruby' gem 'nokogiri', '>= 1.4.5' # Needed for compiling the ActionDispatch::Journey parser -- cgit v1.2.3 From 18be17ac43c7e40ba184e9f279a0075cab3346b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Thu, 5 Dec 2013 00:28:51 -0200 Subject: Use the released arel gem --- Gemfile | 1 - 1 file changed, 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index e1278e6fdf..746dbac325 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,6 @@ gem 'bcrypt-ruby', '~> 3.1.2' gem 'jquery-rails', '~> 2.2.0' gem 'turbolinks' gem 'coffee-rails', '~> 4.0.0' -gem 'arel', github: 'rails/arel', branch: 'master' # This needs to be with require false to avoid # it being automatically loaded by sprockets -- cgit v1.2.3 From d2ed433b0af948da78e971bf342c506b27f6072f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Tue, 24 Dec 2013 10:02:07 +0100 Subject: Only build a ConnectionSpecification if required --- Gemfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 746dbac325..ebc4312f64 100644 --- a/Gemfile +++ b/Gemfile @@ -36,9 +36,9 @@ group :test do gem 'ruby-prof', '~> 0.11.2' end - platforms :mri_19, :mri_20 do - gem 'debugger' - end + # platforms :mri_19, :mri_20 do + # gem 'debugger' + # end gem 'benchmark-ips' end -- cgit v1.2.3