nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Jonne Haß 2016-01-28 16:36:46 +01:00
commit 762299b6ad
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -118,6 +118,7 @@ Contributions are very welcome, the hard work is done!
## 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)

2
Gemfile
View file

@ -186,7 +186,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: