Remove unnecessary initializer and comments in Gemfile and add explicit rubyzip gem version in Gemfile with description
closes #6001
This commit is contained in:
parent
2ba2ef1b9c
commit
36d6c5d2ba
4 changed files with 5 additions and 11 deletions
|
|
@ -18,6 +18,7 @@
|
|||
* Improve the logging messages of Sidekiq messages [#5988](https://github.com/diaspora/diaspora/pull/5988)
|
||||
* Improve the logging of Eyes output [#5989](https://github.com/diaspora/diaspora/pull/5989)
|
||||
* Gracefully handle XML parse errors within federation [#5991](https://github.com/diaspora/diaspora/pull/5991)
|
||||
* Remove zip-zip workaround gem [#6001](https://github.com/diaspora/diaspora/pull/6001)
|
||||
|
||||
## Bug fixes
|
||||
* Disable auto follow back on aspect deletion [#5846](https://github.com/diaspora/diaspora/pull/5846)
|
||||
|
|
|
|||
6
Gemfile
6
Gemfile
|
|
@ -173,9 +173,9 @@ gem "rails-timeago", "2.11.0"
|
|||
|
||||
gem "logging-rails", "0.5.0", require: "logging/rails"
|
||||
|
||||
# # Workarounds
|
||||
# # https://github.com/rubyzip/rubyzip#important-note
|
||||
gem "rubyzip"
|
||||
# Reading and writing zip files
|
||||
|
||||
gem "rubyzip", "1.1.7"
|
||||
|
||||
# Prevent occasions where minitest is not bundled in
|
||||
# packaged versions of ruby. See following issues/prs:
|
||||
|
|
|
|||
|
|
@ -828,7 +828,7 @@ DEPENDENCIES
|
|||
rspec-rails (= 3.2.1)
|
||||
rubocop (= 0.31.0)
|
||||
ruby-oembed (= 0.8.14)
|
||||
rubyzip
|
||||
rubyzip (= 1.1.7)
|
||||
sass-rails (= 5.0.1)
|
||||
selenium-webdriver (= 2.45.0)
|
||||
shoulda-matchers (= 2.8.0)
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
# https://github.com/rubyzip/rubyzip#configuration
|
||||
# Zip.setup do |c|
|
||||
# c.on_exists_proc = true
|
||||
# c.continue_on_exists_proc = true
|
||||
# c.unicode_names = true
|
||||
# c.default_compression = Zlib::BEST_COMPRESSION
|
||||
# end
|
||||
Loading…
Reference in a new issue