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 @@ -14,7 +14,7 @@ gem 'geocoder'
gem "coffee-rails"
gem "gmaps4rails"
gem 'cloudinary'
gem 'carrierwave', '~> 0.11.2'
gem 'carrierwave', '~> 2.1.1'
gem 'plyr-rails'
gem 'acts_as_follower', github: 'tcocca/acts_as_follower', branch: 'master'
gem 'acts_as_votable'
Expand Down
39 changes: 25 additions & 14 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ GEM
minitest (~> 5.1)
tzinfo (~> 1.1)
acts_as_votable (0.11.1)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
arel (8.0.0)
autoprefixer-rails (7.1.6)
execjs
Expand All @@ -59,12 +61,14 @@ GEM
sass (>= 3.3.4)
builder (3.2.3)
byebug (9.1.0)
carrierwave (0.11.2)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
json (>= 1.7)
mime-types (>= 1.16)
carrierwave (2.1.1)
activemodel (>= 5.0.0)
activesupport (>= 5.0.0)
addressable (~> 2.6)
image_processing (~> 1.1)
mimemagic (>= 0.3.0)
mini_mime (>= 0.1.3)
ssrf_filter (~> 1.0)
cloudinary (1.8.1)
aws_cf_signer
rest-client
Expand All @@ -76,7 +80,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.0.5)
concurrent-ruby (1.1.8)
crass (1.0.3)
devise (4.3.0)
bcrypt (~> 3.0)
Expand All @@ -103,16 +107,18 @@ GEM
domain_name (~> 0.5)
httparty (0.15.6)
multi_xml (>= 0.5.2)
i18n (0.9.1)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
image_processing (1.12.1)
mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.17, < 3)
jbuilder (2.7.0)
activesupport (>= 4.2.0)
multi_json (>= 1.2)
jquery-rails (4.3.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (2.1.0)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
Expand All @@ -122,13 +128,14 @@ GEM
mail (2.7.0)
mini_mime (>= 0.1.1)
method_source (0.9.0)
mime-types (3.1)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mimemagic (0.3.2)
mime-types-data (3.2020.1104)
mimemagic (0.3.5)
mini_magick (4.11.0)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.10.3)
minitest (5.14.3)
multi_json (1.12.2)
multi_xml (0.6.0)
netrc (0.11.0)
Expand All @@ -146,6 +153,7 @@ GEM
pry (~> 0.10)
pry-rails (0.3.6)
pry (>= 0.10.4)
public_suffix (4.0.6)
puma (3.10.0)
rack (2.0.3)
rack-test (0.8.0)
Expand Down Expand Up @@ -186,6 +194,8 @@ GEM
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
ruby-vips (2.0.17)
ffi (~> 1.9)
sass (3.5.3)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
Expand Down Expand Up @@ -214,10 +224,11 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
ssrf_filter (1.0.7)
thor (0.20.0)
thread_safe (0.3.6)
tilt (2.0.8)
tzinfo (1.2.4)
tzinfo (1.2.9)
thread_safe (~> 0.1)
uglifier (3.2.0)
execjs (>= 0.3.0, < 3)
Expand All @@ -243,7 +254,7 @@ DEPENDENCIES
acts_as_votable
autoprefixer-rails
bootstrap-sass
carrierwave (~> 0.11.2)
carrierwave (~> 2.1.1)
cloudinary
coffee-rails
devise
Expand Down