Commit 43b16321 authored by Justin Ramos's avatar Justin Ramos Committed by Benjamin Neff
Browse files

only require fog/aws 

closes #7201
parent 85888449

Changelog.md

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
* Refactor ShareVisibilitesController to use PostService [#7196](https://github.com/diaspora/diaspora/pull/7196)

* Unify desktop and mobile head elements [#7194](https://github.com/diaspora/diaspora/pull/7194)

* Refactor flash messages on ajax errors for comments, likes, reshares and aspect memberships [#7202](https://github.com/diaspora/diaspora/pull/7202)

* Only require AWS-module for fog [#7201](https://github.com/diaspora/diaspora/pull/7201)



## Bug fixes

* Fix fetching comments after fetching likes [#7167](https://github.com/diaspora/diaspora/pull/7167)

Gemfile

+1 −1
Original line number Diff line number Diff line
@@ -72,8 +72,8 @@ gem "activerecord-import", "0.15.0" 


# File uploading



gem "fog",         "1.38.0", require: "fog/aws"

gem "carrierwave", "0.11.2"

gem "fog",         "1.38.0"

gem "mini_magick", "4.5.1"



# GUID generation