From 8962e96e3926a0c8d11d57eb583d5879dab0637c Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Wed, 3 Aug 2011 18:14:11 -0300 Subject: This dep is already defined in activerecord.gemspec --- Gemfile | 2 -- 1 file changed, 2 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index ec064bbda8..f6caa1ee65 100644 --- a/Gemfile +++ b/Gemfile @@ -4,8 +4,6 @@ gemspec if ENV['AREL'] gem "arel", :path => ENV['AREL'] -else - gem "arel", '~> 2.1.3' end gem "jquery-rails" -- cgit v1.2.3 From 43e581ef7fb24d11cba37bb4a74f8915ff74f402 Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Sat, 6 Aug 2011 09:15:32 -0300 Subject: Use rake >= 0.9.3.beta.1 in Ruby 1.9.3 --- Gemfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index f6caa1ee65..e11514d5e6 100644 --- a/Gemfile +++ b/Gemfile @@ -11,7 +11,12 @@ gem "jquery-rails" # it being automatically loaded by sprockets gem "uglifier", ">= 1.0.0", :require => false -gem "rake", ">= 0.8.7" +# Temp fix until rake 0.9.3 is out +if RUBY_VERSION >= "1.9.3" + gem "rake", "0.9.3.beta.1" +else + gem "rake", ">= 0.8.7" +end gem "mocha", ">= 0.9.8" group :doc do -- cgit v1.2.3 From 827a0fee07eff7ca35ecdf5ca650f2094ad4825a Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Sat, 27 Aug 2011 03:55:01 -0700 Subject: use sdoc to generate the API --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index e11514d5e6..f0880926a3 100644 --- a/Gemfile +++ b/Gemfile @@ -21,7 +21,7 @@ gem "mocha", ">= 0.9.8" group :doc do gem "rdoc", "~> 3.4" - gem "horo", "= 1.0.3" + gem "sdoc", "~> 0.3" gem "RedCloth", "~> 4.2" if RUBY_VERSION < "1.9.3" gem "w3c_validators" end -- cgit v1.2.3 From 67790644372ad3a771810f1d6d99687d795789ea Mon Sep 17 00:00:00 2001 From: Guillermo Iguaran Date: Thu, 1 Sep 2011 23:54:17 -0500 Subject: Remove hard dependency on bcrypt. --- Gemfile | 1 + 1 file changed, 1 insertion(+) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index f0880926a3..d36aec6b4a 100644 --- a/Gemfile +++ b/Gemfile @@ -6,6 +6,7 @@ if ENV['AREL'] gem "arel", :path => ENV['AREL'] end +gem "bcrypt-ruby", "~> 3.0.0" gem "jquery-rails" # This needs to be with require false to avoid # it being automatically loaded by sprockets -- cgit v1.2.3 From 5e35d62cf5adf2557372afbcb846e87830628bb5 Mon Sep 17 00:00:00 2001 From: Arun Agrawal Date: Mon, 5 Sep 2011 15:07:45 +0530 Subject: Uglifier bump --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index d36aec6b4a..54e171b0db 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,7 @@ gem "bcrypt-ruby", "~> 3.0.0" gem "jquery-rails" # This needs to be with require false to avoid # it being automatically loaded by sprockets -gem "uglifier", ">= 1.0.0", :require => false +gem "uglifier", ">= 1.0.3", :require => false # Temp fix until rake 0.9.3 is out if RUBY_VERSION >= "1.9.3" -- cgit v1.2.3 From 5f0b37c486dcc735b5817852932e761f5ff60152 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Thu, 8 Sep 2011 10:51:23 -0700 Subject: Switching rack-mount to journey. --- Gemfile | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 54e171b0db..5ce420c3a3 100644 --- a/Gemfile +++ b/Gemfile @@ -8,6 +8,13 @@ end gem "bcrypt-ruby", "~> 3.0.0" gem "jquery-rails" + +if ENV['JOURNEY'] + gem "journey", :path => ENV['JOURNEY'] +else + gem "journey", :git => "git://github.com/rails/journey" +end + # This needs to be with require false to avoid # it being automatically loaded by sprockets gem "uglifier", ">= 1.0.3", :require => false -- cgit v1.2.3 From b2bf725d795634fb2383f3a4fa5ab5e9c61c54f1 Mon Sep 17 00:00:00 2001 From: Arun Agrawal Date: Sat, 17 Sep 2011 18:39:30 +0530 Subject: Bump AR-JDBC version. THis version is compatible with 3.1 and above --- Gemfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 5ce420c3a3..508d083fe6 100644 --- a/Gemfile +++ b/Gemfile @@ -75,7 +75,7 @@ end platforms :jruby do gem "ruby-debug", ">= 0.10.3" gem "json" - gem "activerecord-jdbcsqlite3-adapter" + gem "activerecord-jdbcsqlite3-adapter", ">= 1.2.0" # This is needed by now to let tests work on JRuby # TODO: When the JRuby guys merge jruby-openssl in @@ -83,8 +83,8 @@ platforms :jruby do gem "jruby-openssl" group :db do - gem "activerecord-jdbcmysql-adapter" - gem "activerecord-jdbcpostgresql-adapter" + gem "activerecord-jdbcmysql-adapter", ">= 1.2.0" + gem "activerecord-jdbcpostgresql-adapter", ">= 1.2.0" end end -- cgit v1.2.3 From 1de89e5e077e2e0948e78af500e78db4daaa03cc Mon Sep 17 00:00:00 2001 From: Terence Lee Date: Thu, 22 Sep 2011 12:29:46 -0500 Subject: AR wants sqlite3 1.3.4 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 508d083fe6..a1585e279c 100644 --- a/Gemfile +++ b/Gemfile @@ -63,7 +63,7 @@ platforms :ruby do gem "nokogiri", ">= 1.4.5" # AR - gem "sqlite3", "~> 1.3.3" + gem "sqlite3", "~> 1.3.4" group :db do gem "pg", ">= 0.11.0" unless ENV['TRAVIS'] # once pg is on travis this can be removed -- cgit v1.2.3 From b564ffcad4df58c8364bafb850774539b161b26a Mon Sep 17 00:00:00 2001 From: Yasuo Honda Date: Sun, 2 Oct 2011 22:51:01 -0400 Subject: To support ActiveRecord unit tests for IBM DB2 --- Gemfile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index a1585e279c..1d9685412f 100644 --- a/Gemfile +++ b/Gemfile @@ -99,3 +99,6 @@ if ENV['ORACLE_ENHANCED_PATH'] || ENV['ORACLE_ENHANCED'] gem "activerecord-oracle_enhanced-adapter", :git => "git://github.com/rsim/oracle-enhanced.git" end end + +# A gem necessary for ActiveRecord tests with Oracle database +gem "ibm_db" if ENV['IBM_DB'] -- cgit v1.2.3 From 8cc70cf32a48eb31503f828802c65f974cf559f3 Mon Sep 17 00:00:00 2001 From: Yasuo Honda Date: Mon, 3 Oct 2011 11:56:11 -0400 Subject: Fix typo in Rakefile --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 1d9685412f..f63260a260 100644 --- a/Gemfile +++ b/Gemfile @@ -100,5 +100,5 @@ if ENV['ORACLE_ENHANCED_PATH'] || ENV['ORACLE_ENHANCED'] end end -# A gem necessary for ActiveRecord tests with Oracle database +# A gem necessary for ActiveRecord tests with IBM DB gem "ibm_db" if ENV['IBM_DB'] -- cgit v1.2.3 From c930170581ac10acf8c3d9433f3ccd5f72b4e6bf Mon Sep 17 00:00:00 2001 From: Arun Agrawal Date: Sat, 22 Oct 2011 21:47:33 +0530 Subject: No need to check ruby version here As rake 0.9.2.2 is out with the same fix as 0.9.3.beta having --- Gemfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index f63260a260..4ac6bf764d 100644 --- a/Gemfile +++ b/Gemfile @@ -19,12 +19,7 @@ end # it being automatically loaded by sprockets gem "uglifier", ">= 1.0.3", :require => false -# Temp fix until rake 0.9.3 is out -if RUBY_VERSION >= "1.9.3" - gem "rake", "0.9.3.beta.1" -else - gem "rake", ">= 0.8.7" -end +gem "rake", ">= 0.8.7" gem "mocha", ">= 0.9.8" group :doc do -- cgit v1.2.3 From 562583c7667f508493ab8c5b1a4215087fafd22d Mon Sep 17 00:00:00 2001 From: Jon Leighton Date: Fri, 4 Nov 2011 16:10:18 +0000 Subject: Add ActiveRecord::Relation#uniq for toggling DISTINCT in the SQL query --- Gemfile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 4ac6bf764d..f94f267f05 100644 --- a/Gemfile +++ b/Gemfile @@ -4,6 +4,8 @@ gemspec if ENV['AREL'] gem "arel", :path => ENV['AREL'] +else + gem "arel", :git => "git://github.com/rails/arel" end gem "bcrypt-ruby", "~> 3.0.0" -- cgit v1.2.3 From df300a754bf64d0c350fdc8c69408c5bd04b80a3 Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Sat, 12 Nov 2011 15:16:53 -0200 Subject: Allow to use ruby-debug in 1.9.3 --- Gemfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index f94f267f05..1b7d478f18 100644 --- a/Gemfile +++ b/Gemfile @@ -41,8 +41,7 @@ platforms :mri_18 do end platforms :mri_19 do - # TODO: Remove the conditional when ruby-debug19 supports Ruby >= 1.9.3 - gem "ruby-debug19", :require => "ruby-debug" unless RUBY_VERSION > "1.9.2" || ENV['TRAVIS'] + gem "ruby-debug19", :require => "ruby-debug" unless ENV['TRAVIS'] end platforms :mri do -- cgit v1.2.3 From df5ec41b891bbd0392e9bb9695c17e3821903eed Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Wed, 16 Nov 2011 10:42:56 -0800 Subject: bundler treats trunk ruby as ruby 1.9, hack around that for now --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 1b7d478f18..97605e32b5 100644 --- a/Gemfile +++ b/Gemfile @@ -41,7 +41,7 @@ platforms :mri_18 do end platforms :mri_19 do - gem "ruby-debug19", :require => "ruby-debug" unless ENV['TRAVIS'] + gem "ruby-debug19", :require => "ruby-debug" unless ENV['TRAVIS'] || RUBY_VERSION >= "2.0" end platforms :mri do -- cgit v1.2.3 From a437986f433a775c7c370ad3f0273938015699df Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Thu, 17 Nov 2011 14:41:53 -0800 Subject: allow people to set a local .Gemfile so that things like ruby-debug are not required for regular development --- Gemfile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 97605e32b5..b0fbb3b310 100644 --- a/Gemfile +++ b/Gemfile @@ -36,13 +36,11 @@ gem "memcache-client", ">= 1.8.5" platforms :mri_18 do gem "system_timer" - gem "ruby-debug", ">= 0.10.3" unless ENV['TRAVIS'] gem "json" end -platforms :mri_19 do - gem "ruby-debug19", :require => "ruby-debug" unless ENV['TRAVIS'] || RUBY_VERSION >= "2.0" -end +# Add your own local bundler stuff +instance_eval File.read ".Gemfile" if File.exists? ".Gemfile" platforms :mri do group :test do @@ -69,7 +67,6 @@ platforms :ruby do end platforms :jruby do - gem "ruby-debug", ">= 0.10.3" gem "json" gem "activerecord-jdbcsqlite3-adapter", ">= 1.2.0" -- cgit v1.2.3 From 13847ccb43c3d0bdd6341887deda212316861e2d Mon Sep 17 00:00:00 2001 From: Arun Agrawal Date: Thu, 17 Nov 2011 12:44:06 +0530 Subject: Bump Mysql2! --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index b0fbb3b310..65950cdc2e 100644 --- a/Gemfile +++ b/Gemfile @@ -62,7 +62,7 @@ platforms :ruby do group :db do gem "pg", ">= 0.11.0" unless ENV['TRAVIS'] # once pg is on travis this can be removed gem "mysql", ">= 2.8.1" - gem "mysql2", ">= 0.3.6" + gem "mysql2", ">= 0.3.10" end end -- cgit v1.2.3