From bdc4f0ebbe43e1582125726256db6460f2d08f09 Mon Sep 17 00:00:00 2001 From: Neil Gehani Date: Wed, 13 Jan 2016 16:45:45 -0800 Subject: [PATCH] Add updated gemfile.lock to version control --- Gemfile.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5900639..42fc4a8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,4 +1,4 @@ -GEM +GEM remote: https://rubygems.org/ specs: actionmailer (4.2.5) @@ -38,11 +38,12 @@ GEM tzinfo (~> 1.1) acts_as_follower (0.2.1) arel (6.0.3) - aws-sdk (1.5.8) - httparty (~> 0.7) - json (~> 1.4) - nokogiri (>= 1.4.4) - uuidtools (~> 2.1) + aws-sdk (2.2.10) + aws-sdk-resources (= 2.2.10) + aws-sdk-core (2.2.10) + jmespath (~> 1.0) + aws-sdk-resources (2.2.10) + aws-sdk-core (= 2.2.10) bcrypt (3.1.10) better_errors (2.1.1) coderay (>= 1.0.0) @@ -68,7 +69,7 @@ GEM execjs coffee-script-source (1.10.0) debug_inspector (0.0.2) - devise (3.5.2) + devise (3.5.3) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) @@ -86,13 +87,11 @@ GEM globalid (0.3.6) activesupport (>= 4.1.0) hike (1.2.3) - httparty (0.13.7) - json (~> 1.8) - multi_xml (>= 0.5.2) i18n (0.7.0) jbuilder (1.2.0) activesupport (>= 3.0.0) - jquery-rails (4.0.5) + jmespath (1.1.3) + jquery-rails (4.1.0) rails-dom-testing (~> 1.0) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -111,7 +110,6 @@ GEM mini_portile2 (2.0.0) minitest (5.8.3) multi_json (1.11.2) - multi_xml (0.5.5) nokogiri (1.6.7.1) mini_portile2 (~> 2.0.0.rc2) orm_adapter (0.5.0) @@ -159,10 +157,12 @@ GEM activesupport (= 4.2.5) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.4.2) - rdoc (4.2.0) - responders (2.1.0) - railties (>= 4.2.0, < 5) + rake (10.5.0) + rdoc (4.2.1) + json (~> 1.4) + responders (2.1.1) + railties (>= 4.2.0, < 5.1) + rmagick (2.15.4) sass (3.2.19) sass-rails (4.0.5) railties (>= 4.0.0, < 5.0) @@ -195,8 +195,7 @@ GEM uglifier (2.7.2) execjs (>= 0.3.0) json (>= 1.8.0) - uuidtools (2.1.5) - warden (1.2.3) + warden (1.2.4) rack (>= 1.0) will_paginate (3.0.7) @@ -224,6 +223,7 @@ DEPENDENCIES protected_attributes rails (= 4.2.5) rails_12factor + rmagick sass-rails (~> 4.0.0) sdoc simple_form (~> 3.0.0.rc)