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 @@ -21,7 +21,7 @@ gem 'devise', '~> 2.1.0'
# Assets
gem 'parslet', '~> 1.4.0'

gem 'paperclip', '~> 3.0.4'
gem 'paperclip', '~> 4.3.7'

gem 'mime-types', '~> 1.18', :require => 'mime/types'

Expand Down
27 changes: 16 additions & 11 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ GEM
multi_json (~> 1.0)
acts-as-taggable-on (2.3.3)
rails (~> 3.0)
arel (3.0.2)
arel (3.0.3)
axlsx (2.0.1)
htmlentities (~> 4.3.1)
nokogiri (>= 1.4.1)
Expand All @@ -51,7 +51,9 @@ GEM
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
charlock_holmes (0.7.3)
cocaine (0.2.1)
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 @@ -60,6 +62,7 @@ GEM
execjs
coffee-script-source (1.3.3)
columnize (0.3.6)
concurrent-ruby (1.1.5)
daemons (1.1.8)
debugger (1.1.4)
columnize (>= 0.3.1)
Expand Down Expand Up @@ -88,7 +91,8 @@ GEM
highline (1.6.13)
hike (1.2.2)
htmlentities (4.3.3)
i18n (0.6.4)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
journey (1.0.4)
jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0)
Expand All @@ -105,8 +109,9 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.23)
mimemagic (0.3.0)
mini_portile (0.6.2)
multi_json (1.7.4)
multi_json (1.13.1)
mysql2 (0.3.11)
mysql2 (0.3.11-x86-mingw32)
net-scp (1.0.4)
Expand All @@ -121,12 +126,12 @@ GEM
nokogiri (1.6.6.2-x86-mingw32)
mini_portile (~> 0.6.0)
orm_adapter (0.4.0)
paperclip (3.0.4)
activemodel (>= 3.0.0)
activerecord (>= 3.0.0)
activesupport (>= 3.0.0)
cocaine (>= 0.0.2)
paperclip (4.3.7)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
cocaine (~> 0.5.5)
mime-types
mimemagic (= 0.3.0)
parslet (1.4.0)
blankslate (~> 2.0)
polyamorous (0.5.0)
Expand Down Expand Up @@ -199,7 +204,7 @@ GEM
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.37)
tzinfo (0.3.55)
uglifier (1.2.6)
execjs (>= 0.3.0)
multi_json (~> 1.3)
Expand Down Expand Up @@ -232,7 +237,7 @@ DEPENDENCIES
jsonify-rails (~> 0.3.2)
mime-types (~> 1.18)
mysql2 (~> 0.3.11)
paperclip (~> 3.0.4)
paperclip (~> 4.3.7)
parslet (~> 1.4.0)
quiet_assets (~> 1.0.1)
rack-ssl-enforcer (~> 0.2.4)
Expand Down