diff --git a/Gemfile b/Gemfile index 583a357..b7f7165 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '3.2.1' +gem 'rails', '3.2.13' gem 'netzke-core', '~>0.8.0' gem 'netzke-basepack', '~>0.8.0' diff --git a/Gemfile.lock b/Gemfile.lock index 2afb47b..c2d474b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,5 +1,5 @@ GIT - remote: git@github.com:spacemunkay/acts_as_loggable.git + remote: https://github.com/spacemunkay/acts_as_loggable.git revision: 6033fe5a44878bb374f73fe473fed9a3396ddc74 specs: acts_as_loggable (0.0.7) @@ -9,34 +9,34 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.1) - actionpack (= 3.2.1) - mail (~> 2.4.0) - actionpack (3.2.1) - activemodel (= 3.2.1) - activesupport (= 3.2.1) + actionmailer (3.2.13) + actionpack (= 3.2.13) + mail (~> 2.5.3) + actionpack (3.2.13) + activemodel (= 3.2.13) + activesupport (= 3.2.13) builder (~> 3.0.0) erubis (~> 2.7.0) - journey (~> 1.0.1) - rack (~> 1.4.0) - rack-cache (~> 1.1) + journey (~> 1.0.4) + rack (~> 1.4.5) + rack-cache (~> 1.2) rack-test (~> 0.6.1) - sprockets (~> 2.1.2) - activemodel (3.2.1) - activesupport (= 3.2.1) + sprockets (~> 2.2.1) + activemodel (3.2.13) + activesupport (= 3.2.13) builder (~> 3.0.0) - activerecord (3.2.1) - activemodel (= 3.2.1) - activesupport (= 3.2.1) - arel (~> 3.0.0) + activerecord (3.2.13) + activemodel (= 3.2.13) + activesupport (= 3.2.13) + arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.1) - activemodel (= 3.2.1) - activesupport (= 3.2.1) - activesupport (3.2.1) - i18n (~> 0.6) + activeresource (3.2.13) + activemodel (= 3.2.13) + activesupport (= 3.2.13) + activesupport (3.2.13) + i18n (= 0.6.1) multi_json (~> 1.0) - addressable (2.3.2) + addressable (2.3.3) arel (3.0.2) bcrypt-ruby (3.0.1) bootstrap-will_paginate (0.0.9) @@ -49,20 +49,20 @@ GEM rack-test (>= 0.5.4) selenium-webdriver (~> 2.0) xpath (~> 0.1.4) - childprocess (0.3.6) - ffi (~> 1.0, >= 1.0.6) - coderay (1.0.8) + childprocess (0.3.9) + ffi (~> 1.0, >= 1.0.11) + coderay (1.0.9) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.4.0) + coffee-script-source (1.6.2) commonjs (0.2.6) database_cleaner (0.9.1) decent_exposure (1.0.2) - devise (2.0.4) + devise (2.0.5) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.0.3) railties (~> 3.1) @@ -76,21 +76,23 @@ GEM factory_girl_rails (1.7.0) factory_girl (~> 2.6.0) railties (>= 3.0.0) - ffi (1.2.0) - gherkin (2.11.5) - json (>= 1.4.6) - guard (1.6.1) + ffi (1.6.0) + formatador (0.2.4) + gherkin (2.11.6) + json (>= 1.7.6) + guard (1.7.0) + formatador (>= 0.2.4) listen (>= 0.6.0) lumberjack (>= 1.0.2) pry (>= 0.9.10) thor (>= 0.14.6) guard-rspec (1.2.1) guard (>= 1.1) - guard-spork (1.4.0) + guard-spork (1.5.0) childprocess (>= 0.2.3) guard (>= 1.1) spork (>= 0.8.4) - haml (3.1.7) + haml (3.1.8) haml-rails (0.3.5) actionpack (>= 3.1, < 4.1) activesupport (>= 3.1, < 4.1) @@ -99,11 +101,11 @@ GEM hike (1.2.1) i18n (0.6.1) journey (1.0.4) - jquery-rails (2.1.4) + jquery-rails (2.2.1) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.7.6) - launchy (2.1.2) + json (1.7.7) + launchy (2.2.0) addressable (~> 2.3) less (2.2.2) commonjs (~> 0.2.6) @@ -111,54 +113,51 @@ GEM actionpack (>= 3.1) less (~> 2.2.0) libv8 (3.3.10.4) - libwebsocket (0.1.7.1) - addressable - websocket - listen (0.7.0) - lumberjack (1.0.2) - mail (2.4.4) + listen (0.7.3) + lumberjack (1.0.3) + mail (2.5.3) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) method_source (0.8.1) - mime-types (1.19) - multi_json (1.5.0) - netzke-basepack (0.8.1) - netzke-core (~> 0.8.0) - netzke-core (0.8.1) - activesupport (>= 3.1.0) - nokogiri (1.5.6) + mime-types (1.22) + multi_json (1.7.2) + netzke-basepack (0.8.2) + netzke-core (~> 0.8.2) + netzke-core (0.8.3) + execjs + uglifier + nokogiri (1.5.9) orm_adapter (0.0.7) polyglot (0.3.3) - pry (0.9.10) + pry (0.9.12) coderay (~> 1.0.5) method_source (~> 0.8) - slop (~> 3.3.1) - rack (1.4.1) + slop (~> 3.4) + rack (1.4.5) rack-cache (1.2) rack (>= 0.4) - rack-ssl (1.3.2) + rack-ssl (1.3.3) rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.1) - actionmailer (= 3.2.1) - actionpack (= 3.2.1) - activerecord (= 3.2.1) - activeresource (= 3.2.1) - activesupport (= 3.2.1) + rails (3.2.13) + actionmailer (= 3.2.13) + actionpack (= 3.2.13) + activerecord (= 3.2.13) + activeresource (= 3.2.13) + activesupport (= 3.2.13) bundler (~> 1.0) - railties (= 3.2.1) - railties (3.2.1) - actionpack (= 3.2.1) - activesupport (= 3.2.1) + railties (= 3.2.13) + railties (3.2.13) + actionpack (= 3.2.13) + activesupport (= 3.2.13) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) - thor (~> 0.14.6) - rake (10.0.3) - rb-fsevent (0.9.3) - rdoc (3.12) + thor (>= 0.14.6, < 2.0) + rake (10.0.4) + rdoc (3.12.2) json (~> 1.4) rspec (2.8.0) rspec-core (~> 2.8.0) @@ -174,28 +173,29 @@ GEM railties (>= 3.0) rspec (~> 2.8.0) rubyzip (0.9.9) - sass (3.2.5) - sass-rails (3.2.5) + sass (3.2.7) + sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - selenium-webdriver (2.27.2) + selenium-webdriver (2.31.0) childprocess (>= 0.2.5) - libwebsocket (~> 0.1.3) multi_json (~> 1.0) rubyzip + websocket (~> 1.0.4) shoulda-matchers (1.0.0) - slop (3.3.3) + slop (3.4.4) spork (0.9.2) - sprockets (2.1.3) + sprockets (2.2.2) hike (~> 1.2) + multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.6) + sqlite3 (1.3.7) therubyracer (0.10.2) libv8 (~> 3.3.10) - thor (0.14.6) - tilt (1.3.3) + thor (0.18.1) + tilt (1.3.6) treetop (1.4.12) polyglot polyglot (>= 0.3.1) @@ -207,14 +207,14 @@ GEM less-rails (~> 2.2.2) railties (>= 3.1) therubyracer (~> 0.10.1) - tzinfo (0.3.35) + tzinfo (0.3.37) uglifier (1.3.0) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) warden (1.1.1) rack (>= 1.0) - websocket (1.0.6) - will_paginate (3.0.3) + websocket (1.0.7) + will_paginate (3.0.4) xpath (0.1.4) nokogiri (~> 1.3) @@ -238,8 +238,7 @@ DEPENDENCIES netzke-basepack (~> 0.8.0) netzke-core (~> 0.8.0) pry (~> 0.9.8) - rails (= 3.2.1) - rb-fsevent + rails (= 3.2.13) rspec-rails (~> 2.8.1) sass-rails (~> 3.2.3) shoulda-matchers (~> 1.0.0)