Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ gem 'feedzirra'
gem 'diffy'

# paperclip with amazon s3
gem "paperclip", "~> 3.0"
gem "paperclip", "~> 4.3"
gem 'aws-sdk', '~> 1.3.4'

gem 'formtastic', :git => 'git://github.com/justinfrench/formtastic.git', :branch => '2.1-stable', :require => 'formtastic'
Expand Down
29 changes: 17 additions & 12 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ GEM
activesupport (3.2.11)
i18n (~> 0.6)
multi_json (~> 1.0)
arel (3.0.2)
arel (3.0.3)
authlogic (3.2.0)
activerecord (>= 3.0.0)
activesupport (>= 3.0.0)
Expand All @@ -91,7 +91,9 @@ GEM
nokogiri (>= 1.4.4)
uuidtools (~> 2.1)
builder (3.0.4)
cocaine (0.4.2)
climate_control (0.2.0)
cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
Expand All @@ -100,6 +102,7 @@ GEM
execjs
coffee-script-source (1.4.0)
commonjs (0.2.6)
concurrent-ruby (1.1.5)
curb (0.8.3)
diffy (2.1.3)
domain_name (0.5.6)
Expand All @@ -121,7 +124,8 @@ GEM
httparty (0.9.0)
multi_json (~> 1.0)
multi_xml
i18n (0.6.1)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
inherited_resources (1.3.1)
has_scope (~> 0.5.0)
responders (~> 0.6)
Expand Down Expand Up @@ -156,21 +160,22 @@ GEM
nokogiri (~> 1.4)
ntlm-http (~> 0.1, >= 0.1.1)
webrobots (~> 0.0, >= 0.0.9)
mime-types (1.19)
multi_json (1.6.1)
mime-types (1.25.1)
mimemagic (0.3.0)
multi_json (1.14.1)
multi_xml (0.5.1)
mysql (2.8.1)
mysql2 (0.3.11)
net-http-digest_auth (1.2.1)
net-http-persistent (2.8)
nokogiri (1.5.5)
ntlm-http (0.1.1)
paperclip (3.3.1)
activemodel (>= 3.0.0)
activerecord (>= 3.0.0)
activesupport (>= 3.0.0)
cocaine (~> 0.4.0)
paperclip (4.3.7)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
cocaine (~> 0.5.5)
mime-types
mimemagic (= 0.3.0)
polyglot (0.3.3)
rack (1.4.5)
rack-cache (1.2)
Expand Down Expand Up @@ -219,7 +224,7 @@ GEM
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.35)
tzinfo (0.3.56)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
Expand Down Expand Up @@ -250,7 +255,7 @@ DEPENDENCIES
mechanize
mysql (= 2.8.1)
mysql2
paperclip (~> 3.0)
paperclip (~> 4.3)
rack-reverse-proxy!
rails (= 3.2.11)
railstrap!
Expand Down