Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update gems and use paperclip 3.5.0

  • Loading branch information...
commit 1f2fb2962d0e23c608f6388ad6516a7bf8676a56 1 parent 9da421c
Dan Collis-Puro authored
Showing with 46 additions and 63 deletions.
  1. +1 −1  Gemfile
  2. +45 −62 Gemfile.lock
View
2  Gemfile
@@ -4,7 +4,7 @@ gem 'rails', '~> 3.2.13'
gem 'aws-sdk', '~> 1.6.0'
gem 'jquery-rails'
-gem 'paperclip', '~> 3.4.0'
+gem 'paperclip', '~> 3.5.0'
gem 'pg'
group :assets do
View
107 Gemfile.lock
@@ -28,71 +28,62 @@ GEM
activesupport (3.2.13)
i18n (= 0.6.1)
multi_json (~> 1.0)
- addressable (2.3.2)
+ addressable (2.3.5)
arel (3.0.2)
aws-sdk (1.6.9)
httparty (~> 0.7)
json (~> 1.4)
nokogiri (>= 1.4.4)
uuidtools (~> 2.1)
- bourne (1.1.2)
- mocha (= 0.10.5)
builder (3.0.4)
- capybara (2.0.2)
+ capybara (2.1.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
- selenium-webdriver (~> 2.0)
- xpath (~> 1.0.0)
- childprocess (0.3.6)
- ffi (~> 1.0, >= 1.0.6)
- cocaine (0.4.2)
+ xpath (~> 2.0)
+ climate_control (0.0.3)
+ activesupport (>= 3.0)
+ cocaine (0.5.1)
+ climate_control (>= 0.0.3, < 1.0)
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)
- diff-lcs (1.1.3)
+ coffee-script-source (1.6.3)
+ diff-lcs (1.2.4)
erubis (2.7.0)
execjs (1.4.0)
multi_json (~> 1.0)
- ffi (1.3.1)
- hike (1.2.1)
- httparty (0.10.0)
+ hike (1.2.3)
+ httparty (0.11.0)
multi_json (~> 1.0)
- multi_xml
+ multi_xml (>= 0.5.2)
i18n (0.6.1)
journey (1.0.4)
- jquery-rails (2.1.4)
+ jquery-rails (3.0.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
- json (1.7.7)
- launchy (2.1.2)
+ json (1.8.0)
+ launchy (2.3.0)
addressable (~> 2.3)
- libwebsocket (0.1.7.1)
- addressable
- websocket
- mail (2.5.3)
- i18n (>= 0.4.0)
+ mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- metaclass (0.0.1)
- mime-types (1.21)
- mocha (0.10.5)
- metaclass (~> 0.0.1)
- multi_json (1.7.1)
- multi_xml (0.5.2)
- nokogiri (1.5.6)
- paperclip (3.4.0)
+ mime-types (1.23)
+ mini_portile (0.5.1)
+ multi_json (1.7.7)
+ multi_xml (0.5.4)
+ nokogiri (1.6.0)
+ mini_portile (~> 0.5.0)
+ paperclip (3.5.0)
activemodel (>= 3.0.0)
- activerecord (>= 3.0.0)
activesupport (>= 3.0.0)
- cocaine (~> 0.4.0)
+ cocaine (~> 0.5.0)
mime-types
- pg (0.14.1)
+ pg (0.15.1)
polyglot (0.3.3)
rack (1.4.5)
rack-cache (1.2)
@@ -116,52 +107,44 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- rake (10.0.3)
+ rake (10.1.0)
rdoc (3.12.2)
json (~> 1.4)
- rspec-core (2.12.2)
- rspec-expectations (2.12.1)
- diff-lcs (~> 1.1.3)
- rspec-mocks (2.12.1)
- rspec-rails (2.12.1)
+ rspec-core (2.14.3)
+ rspec-expectations (2.14.0)
+ diff-lcs (>= 1.1.3, < 2.0)
+ rspec-mocks (2.14.1)
+ rspec-rails (2.14.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
- rspec-core (~> 2.12.0)
- rspec-expectations (~> 2.12.0)
- rspec-mocks (~> 2.12.0)
- rubyzip (0.9.9)
- sass (3.2.5)
- sass-rails (3.2.5)
+ rspec-core (~> 2.14.0)
+ rspec-expectations (~> 2.14.0)
+ rspec-mocks (~> 2.14.0)
+ sass (3.2.9)
+ sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- selenium-webdriver (2.27.2)
- childprocess (>= 0.2.5)
- libwebsocket (~> 0.1.3)
- multi_json (~> 1.0)
- rubyzip
- shoulda-matchers (1.4.2)
+ shoulda-matchers (2.2.0)
activesupport (>= 3.0.0)
- bourne (~> 1.1.2)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.6)
- thor (0.17.0)
- tilt (1.3.6)
- treetop (1.4.12)
+ sqlite3 (1.3.7)
+ thor (0.18.1)
+ tilt (1.4.1)
+ treetop (1.4.14)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.37)
- uglifier (1.3.0)
+ uglifier (2.1.2)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
- uuidtools (2.1.3)
- websocket (1.0.6)
- xpath (1.0.0)
+ uuidtools (2.1.4)
+ xpath (2.0.0)
nokogiri (~> 1.3)
PLATFORMS
@@ -173,7 +156,7 @@ DEPENDENCIES
coffee-rails (~> 3.2.1)
jquery-rails
launchy
- paperclip (~> 3.4.0)
+ paperclip (~> 3.5.0)
pg
rails (~> 3.2.13)
rspec-rails
Please sign in to comment.
Something went wrong with that request. Please try again.