diff --git a/week_01/selfstarter-master/Gemfile b/week_01/selfstarter-master/Gemfile old mode 100755 new mode 100644 index d2fc666..307b93f --- a/week_01/selfstarter-master/Gemfile +++ b/week_01/selfstarter-master/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' ruby '1.9.3' gem 'rails', '3.2.13' -gem 'json', '~> 1.7.7' +gem 'json', '~> 2.3.0' group :development do gem 'sqlite3' diff --git a/week_01/selfstarter-master/Gemfile.lock b/week_01/selfstarter-master/Gemfile.lock old mode 100755 new mode 100644 index f37514e..babb2c7 --- a/week_01/selfstarter-master/Gemfile.lock +++ b/week_01/selfstarter-master/Gemfile.lock @@ -50,13 +50,13 @@ GEM eventmachine (1.0.0) execjs (1.4.0) multi_json (~> 1.0) - hike (1.2.1) + hike (1.2.3) i18n (0.6.1) journey (1.0.4) jquery-rails (2.1.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.7.7) + json (2.3.0) mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) @@ -66,7 +66,7 @@ GEM mime-types (1.22) mocha (0.10.5) metaclass (~> 0.0.1) - multi_json (1.7.2) + multi_json (1.15.0) multi_xml (0.5.3) pg (0.14.1) polyglot (0.3.3) @@ -76,12 +76,12 @@ GEM slop (~> 3.3.1) pry-rails (0.2.2) pry (>= 0.9.10) - rack (1.4.5) - rack-cache (1.2) + rack (1.4.7) + rack-cache (1.7.1) rack (>= 0.4) - rack-ssl (1.3.3) + rack-ssl (1.3.4) rack - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) rails (3.2.13) actionmailer (= 3.2.13) @@ -100,9 +100,8 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.0.3) - rdoc (3.12) - json (~> 1.4) + rake (12.2.1) + rdoc (3.9.5) rest-client (1.6.7) mime-types (>= 1.16) rspec-core (2.12.2) @@ -129,7 +128,7 @@ GEM activesupport (>= 3.0.0) bourne (~> 1.1.2) slop (3.3.3) - sprockets (2.2.2) + sprockets (2.2.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -139,8 +138,8 @@ GEM daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) - thor (0.16.0) - tilt (1.3.3) + thor (0.20.3) + tilt (1.4.1) treetop (1.4.12) polyglot polyglot (>= 0.3.1) @@ -156,7 +155,7 @@ DEPENDENCIES amazon_flex_pay coffee-rails (~> 3.2.1) jquery-rails - json (~> 1.7.7) + json (~> 2.3.0) pg pry-rails rails (= 3.2.13)