From 0560cedab0dce84e0bbb082ba2b12a4e50731044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Thu, 20 Sep 2012 14:57:51 +0200 Subject: [PATCH 1/5] bump activerecord-import --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 3b3bbe58f..90dbfa39c 100644 --- a/Gemfile +++ b/Gemfile @@ -56,7 +56,7 @@ end gem 'settingslogic', :git => 'https://github.com/binarylogic/settingslogic.git' # database -gem "activerecord-import", "0.2.10" +gem "activerecord-import", "0.2.11" gem 'foreigner', '1.2.1' gem 'mysql2', '0.3.11' if ENV['DB'].nil? || ENV['DB'] == 'all' || ENV['DB'] == 'mysql' gem 'pg', '0.14.1' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres' diff --git a/Gemfile.lock b/Gemfile.lock index df4642cb0..830bfc415 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -62,7 +62,7 @@ GEM activesupport (= 3.2.8) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activerecord-import (0.2.10) + activerecord-import (0.2.11) activerecord (~> 3.0) activerecord (~> 3.0) activeresource (3.2.8) @@ -451,7 +451,7 @@ PLATFORMS ruby DEPENDENCIES - activerecord-import (= 0.2.10) + activerecord-import (= 0.2.11) acts-as-taggable-on (= 2.3.3) acts_as_api (= 0.4.1) addressable (= 2.3.2) From 254d4fd3358cb358109ee38f889e505746fc14f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Thu, 20 Sep 2012 20:11:07 +0200 Subject: [PATCH 2/5] bump heroku and fog --- Gemfile | 4 ++-- Gemfile.lock | 24 +++++++++++++----------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Gemfile b/Gemfile index 90dbfa39c..9d26b1d6c 100644 --- a/Gemfile +++ b/Gemfile @@ -65,7 +65,7 @@ gem 'sqlite3' if ENV['DB'] == 'all' || ENV['DB'] == 'sqlite' # file uploading gem 'carrierwave', '0.6.2' -gem 'fog', '1.4.0' +gem 'fog', '1.6.0' gem 'mini_magick', '3.4' # JSON and API @@ -170,7 +170,7 @@ group :test, :development do end group :development do - gem 'heroku', '2.28.12' + gem 'heroku', '2.31.4' gem 'heroku_san', '3.0.4' gem 'capistrano', '2.12.0', :require => false gem 'capistrano_colors', '0.5.5', :require => false diff --git a/Gemfile.lock b/Gemfile.lock index 830bfc415..bad4e9ffd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -146,7 +146,7 @@ GEM diff-lcs (1.1.3) erubis (2.7.0) eventmachine (0.12.10) - excon (0.14.3) + excon (0.16.2) execjs (1.4.0) multi_json (~> 1.0) factory_girl (4.1.0) @@ -163,9 +163,9 @@ GEM fixture_builder (0.3.4) activerecord (>= 2) activesupport (>= 2) - fog (1.4.0) + fog (1.6.0) builder - excon (~> 0.14.0) + excon (~> 0.14) formatador (~> 0.2.0) mime-types multi_json (~> 1.0) @@ -204,14 +204,14 @@ GEM sprockets (>= 2.0.3) tilt hashie (1.2.0) - heroku (2.28.12) - heroku-api (~> 0.2.8) + heroku (2.31.4) + heroku-api (~> 0.3.5) launchy (>= 0.3.2) - netrc (~> 0.7.5) + netrc (~> 0.7.7) rest-client (~> 1.6.1) rubyzip - heroku-api (0.2.8) - excon (~> 0.14.3) + heroku-api (0.3.5) + excon (~> 0.16.1) heroku_san (3.0.4) activesupport heroku (>= 2) @@ -243,6 +243,7 @@ GEM jquery-ui-rails (0.2.2) jquery-rails railties (>= 3.1.0) + jruby-pageant (1.1.1) json (1.7.5) kaminari (0.13.0) actionpack (>= 3.0.0) @@ -274,7 +275,8 @@ GEM net-ssh (>= 1.99.1) net-sftp (2.0.5) net-ssh (>= 2.0.9) - net-ssh (2.5.2) + net-ssh (2.6.0) + jruby-pageant (>= 1.1.1) net-ssh-gateway (1.1.0) net-ssh (>= 1.99.1) netrc (0.7.7) @@ -474,7 +476,7 @@ DEPENDENCIES faraday_middleware (= 0.8.8) fastercsv (= 1.5.5) fixture_builder (= 0.3.4) - fog (= 1.4.0) + fog (= 1.6.0) foreigner (= 1.2.1) foreman (= 0.59) fuubar (= 1.0.0) @@ -484,7 +486,7 @@ DEPENDENCIES guard-spork (= 0.8.0) haml (= 3.1.7) handlebars_assets (= 0.6.5) - heroku (= 2.28.12) + heroku (= 2.31.4) heroku_san (= 3.0.4) http_accept_language (= 1.0.2) i18n-inflector-rails (~> 1.0) From d5be4d6e2b30e4c1e249b67242c578d6fb1e0861 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Thu, 20 Sep 2012 20:13:44 +0200 Subject: [PATCH 3/5] bump asset_sync --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 9d26b1d6c..845809693 100644 --- a/Gemfile +++ b/Gemfile @@ -126,7 +126,7 @@ group :assets do gem 'uglifier', '1.3.0' # asset_sync is required as needed by application.rb - gem "asset_sync", '0.4.2', :require => nil + gem "asset_sync", '0.5.0', :require => nil end gem 'jquery-rails', '2.0.2' diff --git a/Gemfile.lock b/Gemfile.lock index bad4e9ffd..905988807 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -82,7 +82,7 @@ GEM activesupport builder arel (3.0.2) - asset_sync (0.4.2) + asset_sync (0.5.0) activemodel fog bbenezech-nested_form (0.0.6) @@ -458,7 +458,7 @@ DEPENDENCIES acts_as_api (= 0.4.1) addressable (= 2.3.2) airbrake (= 3.1.0) - asset_sync (= 0.4.2) + asset_sync (= 0.5.0) bootstrap-sass (= 2.1.0.0) bundler (> 1.1.0) capistrano (= 2.12.0) From 7ba092ae0be95429f0b83630ddd38524c4993cfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Wed, 26 Sep 2012 18:08:50 +0200 Subject: [PATCH 4/5] bump jquery-rails --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 845809693..0053cc891 100644 --- a/Gemfile +++ b/Gemfile @@ -129,7 +129,7 @@ group :assets do gem "asset_sync", '0.5.0', :require => nil end -gem 'jquery-rails', '2.0.2' +gem 'jquery-rails', '2.1.3' # web diff --git a/Gemfile.lock b/Gemfile.lock index 905988807..abf3d49ce 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -237,8 +237,8 @@ GEM selenium-webdriver (>= 0.1.3) jasmine-core (1.2.0) journey (1.0.4) - jquery-rails (2.0.2) - railties (>= 3.2.0, < 5.0) + jquery-rails (2.1.3) + railties (>= 3.1.0, < 5.0) thor (~> 0.14) jquery-ui-rails (0.2.2) jquery-rails @@ -491,7 +491,7 @@ DEPENDENCIES http_accept_language (= 1.0.2) i18n-inflector-rails (~> 1.0) jasmine (= 1.2.1) - jquery-rails (= 2.0.2) + jquery-rails (= 2.1.3) json (= 1.7.5) markerb! messagebus_ruby_api (= 1.0.3) From ac59a3fa7aba2cd8de59cb6b20334500c1f6b61b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Wed, 26 Sep 2012 18:34:28 +0200 Subject: [PATCH 5/5] rails_admin version that is no longer conflicting with client_side_validations was released --- Gemfile | 2 +- Gemfile.lock | 45 +++++++++++++++++++-------------------------- 2 files changed, 20 insertions(+), 27 deletions(-) diff --git a/Gemfile b/Gemfile index 0053cc891..1bb479926 100644 --- a/Gemfile +++ b/Gemfile @@ -36,7 +36,7 @@ gem 'newrelic_rpm', '3.3.5' gem "rpm_contrib", '2.1.11' group :production do # we don't install these on travis to speed up test runs - gem 'rails_admin', :git => 'git://github.com/halida/rails_admin.git' + gem 'rails_admin', '0.1.1' gem 'fastercsv', '1.5.5', :require => false gem 'rack-ssl', '1.3.2', :require => 'rack/ssl' gem 'rack-rewrite', '1.2.1', :require => false diff --git a/Gemfile.lock b/Gemfile.lock index abf3d49ce..b70604c63 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,21 +1,3 @@ -GIT - remote: git://github.com/halida/rails_admin.git - revision: 590dceb10812a9207e42dbccecd5d1031715ae80 - specs: - rails_admin (0.0.3) - bbenezech-nested_form (~> 0.0.6) - bootstrap-sass (~> 2.0, >= 2.0.3) - builder (~> 3.0) - coffee-rails (~> 3.1) - haml (~> 3.1) - jquery-rails (>= 1.0.17) - jquery-ui-rails (~> 0.2.2) - kaminari (~> 0.12) - rack-pjax (~> 0.5) - rails (~> 3.1) - remotipart (~> 1.0) - sass-rails (~> 3.1) - GIT remote: https://github.com/Empact/roxml.git revision: 7ea9a9ffd2338aaef5b04cb792060ae8c98f346a @@ -85,7 +67,6 @@ GEM asset_sync (0.5.0) activemodel fog - bbenezech-nested_form (0.0.6) bcrypt-ruby (3.0.1) bootstrap-sass (2.1.0.0) builder (3.0.3) @@ -220,7 +201,6 @@ GEM highline (1.6.12) hike (1.2.1) hodel_3000_compliant_logger (0.1.0) - hpricot (0.8.6) http_accept_language (1.0.2) httpauth (0.1) i18n (0.6.1) @@ -240,15 +220,14 @@ GEM jquery-rails (2.1.3) railties (>= 3.1.0, < 5.0) thor (~> 0.14) - jquery-ui-rails (0.2.2) + jquery-ui-rails (2.0.1) jquery-rails railties (>= 3.1.0) jruby-pageant (1.1.1) json (1.7.5) - kaminari (0.13.0) + kaminari (0.14.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) - railties (>= 3.0.0) kgio (2.7.4) launchy (2.1.2) addressable (~> 2.3) @@ -271,6 +250,7 @@ GEM multi_json (1.3.6) multipart-post (1.1.5) mysql2 (0.3.11) + nested_form (0.2.3) net-scp (1.0.4) net-ssh (>= 1.99.1) net-sftp (2.0.5) @@ -318,8 +298,8 @@ GEM rack-mobile-detect (0.4.0) rack rack-piwik (0.1.3) - rack-pjax (0.5.9) - hpricot (~> 0.8.6) + rack-pjax (0.6.0) + nokogiri (~> 1.5) rack (~> 1.3) rack-protection (1.2.0) rack @@ -338,6 +318,19 @@ GEM railties (= 3.2.8) rails-i18n (0.6.6) i18n (~> 0.5) + rails_admin (0.1.1) + bootstrap-sass (~> 2.0) + builder (~> 3.0) + coffee-rails (~> 3.1) + haml (~> 3.1) + jquery-rails (~> 2.0) + jquery-ui-rails (~> 2.0) + kaminari (~> 0.12) + nested_form (~> 0.2.3) + rack-pjax (~> 0.5) + rails (~> 3.1) + remotipart (~> 1.0) + sass-rails (~> 3.1) rails_autolink (1.0.9) rails (~> 3.1) railties (3.2.8) @@ -513,7 +506,7 @@ DEPENDENCIES rack-ssl (= 1.3.2) rails (= 3.2.8) rails-i18n - rails_admin! + rails_admin (= 0.1.1) rails_autolink (= 1.0.9) redcarpet (= 2.1.1) remotipart (= 1.0.2)