Commit 8c0d12b6 authored by Sayed Abdelhaleem's avatar Sayed Abdelhaleem Committed by Jonne Haß

fix NameError: uninitialized constant User::Zip by specifying rubzip gem main file name in Gemfile

closes #6659
parent 211365c1
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
## Bug fixes ## Bug fixes
* Fix plural rules handling more than wanted as "one" [#6630](https://github.com/diaspora/diaspora/pull/6630) * 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) * 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 ## Features
* Keyboard shortcuts now do work on profile pages as well [#6647](https://github.com/diaspora/diaspora/pull/6647/files) * Keyboard shortcuts now do work on profile pages as well [#6647](https://github.com/diaspora/diaspora/pull/6647/files)
......
...@@ -176,7 +176,7 @@ gem "logging-rails", "0.5.0", require: "logging/rails" ...@@ -176,7 +176,7 @@ gem "logging-rails", "0.5.0", require: "logging/rails"
# Reading and writing zip files # 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 # Prevent occasions where minitest is not bundled in
# packaged versions of ruby. See following issues/prs: # packaged versions of ruby. See following issues/prs:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment