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

Merge branch 'hotfix/0.5.6.1' into develop

Browse source
This commit is contained in:
Dennis Schubert 2016-01-22 01:40:29 +01:00
commit 22fa2c7cc4
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Changelog.md
View file

@ -110,6 +110,11 @@ Contributions are very welcome, the hard work is done!
## 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)
# 0.5.6.1
* Fix Nokogiri CVE-2015-7499
* Fix unsafe "Remember me" cookies in Devise
# 0.5.6.0 # 0.5.6.0
## Refactor ## Refactor

4
Gemfile
View file

@ -22,7 +22,7 @@ gem "json-schema", "2.5.2"
# Authentication # Authentication
gem "devise", "3.5.3" gem "devise", "3.5.4"
gem "devise_lastseenable", "0.0.6" gem "devise_lastseenable", "0.0.6"
gem "devise-token_authenticatable", "~> 0.4.0" gem "devise-token_authenticatable", "~> 0.4.0"
@ -133,7 +133,7 @@ gem "leaflet-rails", "0.7.4"
# Parsing # Parsing
gem "nokogiri", "1.6.7.1" gem "nokogiri", "1.6.7.2"
gem "redcarpet", "3.3.4" gem "redcarpet", "3.3.4"
gem "twitter-text", "1.13.0" gem "twitter-text", "1.13.0"
gem "roxml", "3.1.6" gem "roxml", "3.1.6"

10
Gemfile.lock
View file

@ -139,7 +139,7 @@ GEM
nokogiri (~> 1.5) nokogiri (~> 1.5)
rails (>= 3, < 5) rails (>= 3, < 5)
database_cleaner (1.5.1) database_cleaner (1.5.1)
devise (3.5.3) devise (3.5.4)
bcrypt (~> 3.0) bcrypt (~> 3.0)
orm_adapter (~> 0.1) orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5) railties (>= 3.2.6, < 5)
@ -486,7 +486,7 @@ GEM
nenv (0.2.0) nenv (0.2.0)
nested_form (0.3.2) nested_form (0.3.2)
nio4r (1.2.0) nio4r (1.2.0)
nokogiri (1.6.7.1) nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2) mini_portile2 (~> 2.0.0.rc2)
notiffany (0.0.8) notiffany (0.0.8)
nenv (~> 0.1) nenv (~> 0.1)
@ -676,7 +676,7 @@ GEM
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rainbow (2.0.0) rainbow (2.0.0)
raindrops (0.15.0) raindrops (0.15.0)
rake (10.4.2) rake (10.5.0)
rb-fsevent (0.9.6) rb-fsevent (0.9.6)
rb-inotify (0.9.5) rb-inotify (0.9.5)
ffi (>= 0.5.0) ffi (>= 0.5.0)
@ -891,7 +891,7 @@ DEPENDENCIES
cucumber-api-steps (= 0.13) cucumber-api-steps (= 0.13)
cucumber-rails (= 1.4.2) cucumber-rails (= 1.4.2)
database_cleaner (= 1.5.1) database_cleaner (= 1.5.1)
devise (= 3.5.3) devise (= 3.5.4)
devise-token_authenticatable (~> 0.4.0) devise-token_authenticatable (~> 0.4.0)
devise_lastseenable (= 0.0.6) devise_lastseenable (= 0.0.6)
diaspora-vines (~> 0.2.0.develop) diaspora-vines (~> 0.2.0.develop)
@ -935,7 +935,7 @@ DEPENDENCIES
minitest minitest
mobile-fu (= 1.3.1) mobile-fu (= 1.3.1)
mysql2 (= 0.3.20) mysql2 (= 0.3.20)
nokogiri (= 1.6.7.1) nokogiri (= 1.6.7.2)
omniauth (= 1.3.1) omniauth (= 1.3.1)
omniauth-facebook (= 3.0.0) omniauth-facebook (= 3.0.0)
omniauth-tumblr (= 1.2) omniauth-tumblr (= 1.2)