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