diff options
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 58 | 
2 files changed, 30 insertions, 30 deletions
| @@ -5,7 +5,7 @@ require File.expand_path('../lib/gemfile_tools.rb', __FILE__)  ## CORE  # rake 11.x throws lots of warnings about rails 3.2 code  gem "rake", "~> 10.4" -gem "rails", "~> 3.2.21" +gem "rails", "~> 3.2.22.4"  gem "couchrest", "~> 1.1.3"  gem "couchrest_model", "~> 2.0.0"  if ARGV.grep(/assets:precompile/).empty? diff --git a/Gemfile.lock b/Gemfile.lock index af414c1..7216894 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,13 +1,13 @@  PATH    remote: engines/billing    specs: -    leap_web_billing (0.6.0) +    leap_web_billing (0.8.0)        braintree  PATH    remote: engines/support    specs: -    leap_web_help (0.6.0) +    leap_web_help (0.8.0)  PATH    remote: vendor/gems/certificate_authority @@ -26,12 +26,12 @@ GEM    remote: https://rubygems.org/    specs:      SyslogLogger (2.0) -    actionmailer (3.2.22.2) -      actionpack (= 3.2.22.2) +    actionmailer (3.2.22.4) +      actionpack (= 3.2.22.4)        mail (~> 2.5.4) -    actionpack (3.2.22.2) -      activemodel (= 3.2.22.2) -      activesupport (= 3.2.22.2) +    actionpack (3.2.22.4) +      activemodel (= 3.2.22.4) +      activesupport (= 3.2.22.4)        builder (~> 3.0.0)        erubis (~> 2.7.0)        journey (~> 1.0.4) @@ -39,18 +39,18 @@ GEM        rack-cache (~> 1.2)        rack-test (~> 0.6.1)        sprockets (~> 2.2.1) -    activemodel (3.2.22.2) -      activesupport (= 3.2.22.2) +    activemodel (3.2.22.4) +      activesupport (= 3.2.22.4)        builder (~> 3.0.0) -    activerecord (3.2.22.2) -      activemodel (= 3.2.22.2) -      activesupport (= 3.2.22.2) +    activerecord (3.2.22.4) +      activemodel (= 3.2.22.4) +      activesupport (= 3.2.22.4)        arel (~> 3.0.2)        tzinfo (~> 0.3.29) -    activeresource (3.2.22.2) -      activemodel (= 3.2.22.2) -      activesupport (= 3.2.22.2) -    activesupport (3.2.22.2) +    activeresource (3.2.22.4) +      activemodel (= 3.2.22.4) +      activesupport (= 3.2.22.4) +    activesupport (3.2.22.4)        i18n (~> 0.6, >= 0.6.4)        multi_json (~> 1.0)      addressable (2.3.6) @@ -157,7 +157,7 @@ GEM      minitest-stub-const (0.2)      mocha (0.13.3)        metaclass (~> 0.0.1) -    multi_json (1.11.2) +    multi_json (1.12.1)      multi_test (0.1.1)      nokogiri (1.6.5)        mini_portile (~> 0.6.0) @@ -184,22 +184,22 @@ GEM        rack      rack-test (0.6.3)        rack (>= 1.0) -    rails (3.2.22.2) -      actionmailer (= 3.2.22.2) -      actionpack (= 3.2.22.2) -      activerecord (= 3.2.22.2) -      activeresource (= 3.2.22.2) -      activesupport (= 3.2.22.2) +    rails (3.2.22.4) +      actionmailer (= 3.2.22.4) +      actionpack (= 3.2.22.4) +      activerecord (= 3.2.22.4) +      activeresource (= 3.2.22.4) +      activesupport (= 3.2.22.4)        bundler (~> 1.0) -      railties (= 3.2.22.2) +      railties (= 3.2.22.4)      rails-i18n (3.0.1)        i18n (~> 0.5)        rails (>= 3.0.0, < 4.0.0)      rails_warden (0.5.8)        warden (>= 1.0.0) -    railties (3.2.22.2) -      actionpack (= 3.2.22.2) -      activesupport (= 3.2.22.2) +    railties (3.2.22.4) +      actionpack (= 3.2.22.4) +      activesupport (= 3.2.22.4)        rack-ssl (~> 1.3.2)        rake (>= 0.8.7)        rdoc (~> 3.4) @@ -244,7 +244,7 @@ GEM      treetop (1.4.15)        polyglot        polyglot (>= 0.3.1) -    tzinfo (0.3.47) +    tzinfo (0.3.51)      uglifier (1.2.7)        execjs (>= 0.3.0)        multi_json (~> 1.3) @@ -294,7 +294,7 @@ DEPENDENCIES    poltergeist    pry    quiet_assets -  rails (~> 3.2.21) +  rails (~> 3.2.22.4)    rails-i18n    rails_warden    rake (~> 10.4) | 
