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

Merge branch 'hotfix/0.0.3.4' into develop

Browse source 
Conflicts:
	Changelog.md
	config/defaults.yml
This commit is contained in:
Jonne Haß 2013-03-18 21:10:29 +01:00
commit a55f6fd98c
3 changed files with 37 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Changelog.md
View file

@ -30,6 +30,10 @@
* Show timestamp when hovering on comment time-ago string. [#4042](https://github.com/diaspora/diaspora/issues/4042) * Show timestamp when hovering on comment time-ago string. [#4042](https://github.com/diaspora/diaspora/issues/4042)
* If sharing a post with photos to Facebook, always include URL to post [#3706](https://github.com/diaspora/diaspora/issues/3706) * If sharing a post with photos to Facebook, always include URL to post [#3706](https://github.com/diaspora/diaspora/issues/3706)
# 0.0.3.4
* Bump Rails to 3.2.13, fixes CVE-2013-1854, CVE-2013-1855, CVE-2013-1856 and CVE-2013-1857. [Read more](http://weblog.rubyonrails.org/2013/3/18/SEC-ANN-Rails-3-2-13-3-1-12-and-2-3-18-have-been-released/)
# 0.0.3.3 # 0.0.3.3
* Switch Gemfile source to https to be compatible with bundler 1.3 * Switch Gemfile source to https to be compatible with bundler 1.3

2
Gemfile
View file

@ -1,6 +1,6 @@
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'rails', '3.2.12' gem 'rails', '3.2.13'
# Appserver # Appserver

64
Gemfile.lock
View file

@ -1,12 +1,12 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionmailer (3.2.12) actionmailer (3.2.13)
actionpack (= 3.2.12) actionpack (= 3.2.13)
mail (~> 2.4.4) mail (~> 2.5.3)
actionpack (3.2.12) actionpack (3.2.13)
activemodel (= 3.2.12) activemodel (= 3.2.13)
activesupport (= 3.2.12) activesupport (= 3.2.13)
builder (~> 3.0.0) builder (~> 3.0.0)
erubis (~> 2.7.0) erubis (~> 2.7.0)
journey (~> 1.0.4) journey (~> 1.0.4)
@ -14,21 +14,21 @@ GEM
rack-cache (~> 1.2) rack-cache (~> 1.2)
rack-test (~> 0.6.1) rack-test (~> 0.6.1)
sprockets (~> 2.2.1) sprockets (~> 2.2.1)
activemodel (3.2.12) activemodel (3.2.13)
activesupport (= 3.2.12) activesupport (= 3.2.13)
builder (~> 3.0.0) builder (~> 3.0.0)
activerecord (3.2.12) activerecord (3.2.13)
activemodel (= 3.2.12) activemodel (= 3.2.13)
activesupport (= 3.2.12) activesupport (= 3.2.13)
arel (~> 3.0.2) arel (~> 3.0.2)
tzinfo (~> 0.3.29) tzinfo (~> 0.3.29)
activerecord-import (0.3.1) activerecord-import (0.3.1)
activerecord (~> 3.0) activerecord (~> 3.0)
activeresource (3.2.12) activeresource (3.2.13)
activemodel (= 3.2.12) activemodel (= 3.2.13)
activesupport (= 3.2.12) activesupport (= 3.2.13)
activesupport (3.2.12) activesupport (3.2.13)
i18n (~> 0.6) i18n (= 0.6.1)
multi_json (~> 1.0) multi_json (~> 1.0)
acts-as-taggable-on (2.3.3) acts-as-taggable-on (2.3.3)
rails (~> 3.0) rails (~> 3.0)
@ -199,7 +199,7 @@ GEM
kgio (2.8.0) kgio (2.8.0)
listen (0.7.2) listen (0.7.2)
lumberjack (1.0.2) lumberjack (1.0.2)
mail (2.4.4) mail (2.5.3)
i18n (>= 0.4.0) i18n (>= 0.4.0)
mime-types (~> 1.16) mime-types (~> 1.16)
treetop (~> 1.4.8) treetop (~> 1.4.8)
@ -213,7 +213,7 @@ GEM
mobile-fu (1.1.1) mobile-fu (1.1.1)
rack-mobile-detect rack-mobile-detect
rails rails
multi_json (1.6.1) multi_json (1.7.1)
multipart-post (1.1.5) multipart-post (1.1.5)
mysql2 (0.3.11) mysql2 (0.3.11)
nested_form (0.3.1) nested_form (0.3.1)
@ -274,14 +274,14 @@ GEM
rack rack
rack-test (0.6.2) rack-test (0.6.2)
rack (>= 1.0) rack (>= 1.0)
rails (3.2.12) rails (3.2.13)
actionmailer (= 3.2.12) actionmailer (= 3.2.13)
actionpack (= 3.2.12) actionpack (= 3.2.13)
activerecord (= 3.2.12) activerecord (= 3.2.13)
activeresource (= 3.2.12) activeresource (= 3.2.13)
activesupport (= 3.2.12) activesupport (= 3.2.13)
bundler (~> 1.0) bundler (~> 1.0)
railties (= 3.2.12) railties (= 3.2.13)
rails-i18n (0.7.2) rails-i18n (0.7.2)
i18n (~> 0.5) i18n (~> 0.5)
rails_admin (0.4.5) rails_admin (0.4.5)
@ -301,9 +301,9 @@ GEM
sass-rails (~> 3.1) sass-rails (~> 3.1)
rails_autolink (1.0.9) rails_autolink (1.0.9)
rails (~> 3.1) rails (~> 3.1)
railties (3.2.12) railties (3.2.13)
actionpack (= 3.2.12) actionpack (= 3.2.13)
activesupport (= 3.2.12) activesupport (= 3.2.13)
rack-ssl (~> 1.3.2) rack-ssl (~> 1.3.2)
rake (>= 0.8.7) rake (>= 0.8.7)
rdoc (~> 3.4) rdoc (~> 3.4)
@ -313,7 +313,7 @@ GEM
rb-fsevent (0.9.3) rb-fsevent (0.9.3)
rb-inotify (0.9.0) rb-inotify (0.9.0)
ffi (>= 0.5.0) ffi (>= 0.5.0)
rdoc (3.12.1) rdoc (3.12.2)
json (~> 1.4) json (~> 1.4)
redcarpet (2.2.2) redcarpet (2.2.2)
redis (3.0.2) redis (3.0.2)
@ -377,7 +377,7 @@ GEM
subexec (0.2.2) subexec (0.2.2)
terminal-table (1.4.5) terminal-table (1.4.5)
thor (0.17.0) thor (0.17.0)
tilt (1.3.3) tilt (1.3.6)
timecop (0.5.9.2) timecop (0.5.9.2)
treetop (1.4.12) treetop (1.4.12)
polyglot polyglot
@ -388,7 +388,7 @@ GEM
simple_oauth (~> 0.2) simple_oauth (~> 0.2)
typhoeus (0.3.3) typhoeus (0.3.3)
mime-types mime-types
tzinfo (0.3.35) tzinfo (0.3.37)
uglifier (1.3.0) uglifier (1.3.0)
execjs (>= 0.3.0) execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2) multi_json (~> 1.0, >= 1.0.2)
@ -464,7 +464,7 @@ DEPENDENCIES
rack-protection (= 1.2) rack-protection (= 1.2)
rack-rewrite (= 1.3.3) rack-rewrite (= 1.3.3)
rack-ssl (= 1.3.3) rack-ssl (= 1.3.3)
rails (= 3.2.12) rails (= 3.2.13)
rails-i18n (= 0.7.2) rails-i18n (= 0.7.2)
rails_admin (= 0.4.5) rails_admin (= 0.4.5)
rails_autolink (= 1.0.9) rails_autolink (= 1.0.9)