Merge pull request #249 from jywarren/gemfile

updated paperclip
publiclab · Jan 23, 2018 · 61e8035 · 61e8035
2 parents 8b47537 + 4b970ab
commit 61e8035
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -18,7 +18,7 @@ group :dependencies do
   gem "ruby-openid", "~>2.5"
   gem "open_id_authentication"
   gem "RubyInline"
-  gem "paperclip", "~>4.2.0"
+  gem "paperclip", "~>4.2.2"
 
   # if you use amazon s3 for warpable image storage
   gem 'aws-sdk', '~> 1.5.7'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -166,12 +166,12 @@ DEPENDENCIES
   mysql2 (~> 0.3.20)
   oa-openid (= 0.3.2)
   open_id_authentication
-  paperclip (~> 4.2.0)
+  paperclip (~> 4.2.2)
   passenger
   rails (~> 3.2)
   rake (~> 10.5.0)
   rdiscount (= 2.1.7.1)
-  recaptcha (= 4.6.3)
+  recaptcha
   right_aws
   ruby-openid (~> 2.5)
   sass
@@ -182,3 +182,9 @@ DEPENDENCIES
   uglifier
   will_paginate (= 3.0.7)
   will_paginate-bootstrap
+
+RUBY VERSION
+   ruby 2.1.2p95
+
+BUNDLED WITH
+   1.14.6