From 43b1632148c17106752753abb0ee40337b478a16 Mon Sep 17 00:00:00 2001 From: Justin Ramos Date: Fri, 18 Nov 2016 19:13:52 +0000 Subject: [PATCH] only require fog/aws closes #7201 --- Changelog.md | 1 + Gemfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 5e6979712..416824bc8 100644 --- a/Changelog.md +++ b/Changelog.md @@ -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) diff --git a/Gemfile b/Gemfile index bc1cd5791..9e4a60e82 100644 --- a/Gemfile +++ b/Gemfile @@ -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