From 8c0d12b6d3dce76356845d91b6f439c5266d3d3e Mon Sep 17 00:00:00 2001
From: Sayed Abdelhaleem <visualsayed@gmail.com>
Date: Thu, 28 Jan 2016 07:02:01 +0200
Subject: [PATCH] fix NameError: uninitialized constant User::Zip by specifying
 rubzip gem main file name in Gemfile

closes #6659
---
 Changelog.md | 1 +
 Gemfile      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 2be275144..8a313b0e4 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,7 @@
 ## Bug fixes
 * Fix plural rules handling more than wanted as "one" [#6630](https://github.com/diaspora/diaspora/pull/6630)
 * Fix `suppress_annoying_errors` eating too much errors [#6653](https://github.com/diaspora/diaspora/pull/6653)
+* Ensure the rubyzip gem is properly loaded [#6659](https://github.com/diaspora/diaspora/pull/6659)
 
 ## Features
 * Keyboard shortcuts now do work on profile pages as well [#6647](https://github.com/diaspora/diaspora/pull/6647/files)
diff --git a/Gemfile b/Gemfile
index 5a27311bc..c79ef9d88 100644
--- a/Gemfile
+++ b/Gemfile
@@ -176,7 +176,7 @@ gem "logging-rails", "0.5.0", require: "logging/rails"
 
 # Reading and writing zip files
 
-gem "rubyzip", "1.1.7"
+gem "rubyzip", "1.1.7", require: "zip"
 
 # Prevent occasions where minitest is not bundled in
 # packaged versions of ruby. See following issues/prs: