Merge branch 'hotfix/0.0.2.1' into develop
Conflicts: Changelog.md Gemfile Gemfile.lock config/defaults.yml
This commit is contained in:
Jonne Haß
commit
26139fc2dc
3 changed files with 32 additions and 30 deletions
|
|
@ -40,6 +40,9 @@
|
||||||
* Removed `debugger` since it was causing bundle problems, and is not necessary given 1.9.3 has a built-in debugger.
|
* Removed `debugger` since it was causing bundle problems, and is not necessary given 1.9.3 has a built-in debugger.
|
||||||
* jasmine 1.2.1 -> 1.3.1 (+ remove useless spec)
|
* jasmine 1.2.1 -> 1.3.1 (+ remove useless spec)
|
||||||
|
|
||||||
|
# 0.0.2.1
|
||||||
|
|
||||||
|
* Upgrade to Rails 3.2.10 as per CVE-2012-5664. [Read more](https://groups.google.com/group/rubyonrails-security/browse_thread/thread/c2353369fea8c53)
|
||||||
|
|
||||||
# 0.0.2.0
|
# 0.0.2.0
|
||||||
|
|
||||||
|
|
@ -122,7 +125,6 @@
|
||||||
|
|
||||||
And their dependencies.
|
And their dependencies.
|
||||||
|
|
||||||
|
|
||||||
# 0.0.1.2
|
# 0.0.1.2
|
||||||
|
|
||||||
Fix exception when the root of a reshare of a reshare got deleted [#3546](https://github.com/diaspora/diaspora/issues/3546)
|
Fix exception when the root of a reshare of a reshare got deleted [#3546](https://github.com/diaspora/diaspora/issues/3546)
|
||||||
|
|
|
||||||
2
Gemfile
2
Gemfile
|
|
@ -1,6 +1,6 @@
|
||||||
source 'http://rubygems.org'
|
source 'http://rubygems.org'
|
||||||
|
|
||||||
gem 'rails', '3.2.9'
|
gem 'rails', '3.2.10'
|
||||||
|
|
||||||
gem 'foreman', '0.60.2'
|
gem 'foreman', '0.60.2'
|
||||||
|
|
||||||
|
|
|
||||||
56
Gemfile.lock
56
Gemfile.lock
|
|
@ -17,12 +17,12 @@ GIT
|
||||||
GEM
|
GEM
|
||||||
remote: http://rubygems.org/
|
remote: http://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (3.2.9)
|
actionmailer (3.2.10)
|
||||||
actionpack (= 3.2.9)
|
actionpack (= 3.2.10)
|
||||||
mail (~> 2.4.4)
|
mail (~> 2.4.4)
|
||||||
actionpack (3.2.9)
|
actionpack (3.2.10)
|
||||||
activemodel (= 3.2.9)
|
activemodel (= 3.2.10)
|
||||||
activesupport (= 3.2.9)
|
activesupport (= 3.2.10)
|
||||||
builder (~> 3.0.0)
|
builder (~> 3.0.0)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
journey (~> 1.0.4)
|
journey (~> 1.0.4)
|
||||||
|
|
@ -30,21 +30,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.9)
|
activemodel (3.2.10)
|
||||||
activesupport (= 3.2.9)
|
activesupport (= 3.2.10)
|
||||||
builder (~> 3.0.0)
|
builder (~> 3.0.0)
|
||||||
activerecord (3.2.9)
|
activerecord (3.2.10)
|
||||||
activemodel (= 3.2.9)
|
activemodel (= 3.2.10)
|
||||||
activesupport (= 3.2.9)
|
activesupport (= 3.2.10)
|
||||||
arel (~> 3.0.2)
|
arel (~> 3.0.2)
|
||||||
tzinfo (~> 0.3.29)
|
tzinfo (~> 0.3.29)
|
||||||
activerecord-import (0.2.11)
|
activerecord-import (0.2.11)
|
||||||
activerecord (~> 3.0)
|
activerecord (~> 3.0)
|
||||||
activerecord (~> 3.0)
|
activerecord (~> 3.0)
|
||||||
activeresource (3.2.9)
|
activeresource (3.2.10)
|
||||||
activemodel (= 3.2.9)
|
activemodel (= 3.2.10)
|
||||||
activesupport (= 3.2.9)
|
activesupport (= 3.2.10)
|
||||||
activesupport (3.2.9)
|
activesupport (3.2.10)
|
||||||
i18n (~> 0.6)
|
i18n (~> 0.6)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
acts-as-taggable-on (2.3.3)
|
acts-as-taggable-on (2.3.3)
|
||||||
|
|
@ -223,7 +223,7 @@ GEM
|
||||||
mobile-fu (1.1.0)
|
mobile-fu (1.1.0)
|
||||||
rack-mobile-detect
|
rack-mobile-detect
|
||||||
rails
|
rails
|
||||||
multi_json (1.4.0)
|
multi_json (1.5.0)
|
||||||
multipart-post (1.1.5)
|
multipart-post (1.1.5)
|
||||||
mysql2 (0.3.11)
|
mysql2 (0.3.11)
|
||||||
nested_form (0.2.3)
|
nested_form (0.2.3)
|
||||||
|
|
@ -284,14 +284,14 @@ GEM
|
||||||
rack
|
rack
|
||||||
rack-test (0.6.2)
|
rack-test (0.6.2)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (3.2.9)
|
rails (3.2.10)
|
||||||
actionmailer (= 3.2.9)
|
actionmailer (= 3.2.10)
|
||||||
actionpack (= 3.2.9)
|
actionpack (= 3.2.10)
|
||||||
activerecord (= 3.2.9)
|
activerecord (= 3.2.10)
|
||||||
activeresource (= 3.2.9)
|
activeresource (= 3.2.10)
|
||||||
activesupport (= 3.2.9)
|
activesupport (= 3.2.10)
|
||||||
bundler (~> 1.0)
|
bundler (~> 1.0)
|
||||||
railties (= 3.2.9)
|
railties (= 3.2.10)
|
||||||
rails-i18n (0.7.0)
|
rails-i18n (0.7.0)
|
||||||
i18n (~> 0.5)
|
i18n (~> 0.5)
|
||||||
rails_admin (0.2.0)
|
rails_admin (0.2.0)
|
||||||
|
|
@ -310,15 +310,15 @@ 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.9)
|
railties (3.2.10)
|
||||||
actionpack (= 3.2.9)
|
actionpack (= 3.2.10)
|
||||||
activesupport (= 3.2.9)
|
activesupport (= 3.2.10)
|
||||||
rack-ssl (~> 1.3.2)
|
rack-ssl (~> 1.3.2)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
rdoc (~> 3.4)
|
rdoc (~> 3.4)
|
||||||
thor (>= 0.14.6, < 2.0)
|
thor (>= 0.14.6, < 2.0)
|
||||||
raindrops (0.10.0)
|
raindrops (0.10.0)
|
||||||
rake (10.0.2)
|
rake (10.0.3)
|
||||||
rb-fsevent (0.9.2)
|
rb-fsevent (0.9.2)
|
||||||
rb-inotify (0.8.8)
|
rb-inotify (0.8.8)
|
||||||
ffi (>= 0.5.0)
|
ffi (>= 0.5.0)
|
||||||
|
|
@ -372,7 +372,7 @@ GEM
|
||||||
tilt (~> 1.3, >= 1.3.3)
|
tilt (~> 1.3, >= 1.3.3)
|
||||||
slop (3.3.3)
|
slop (3.3.3)
|
||||||
spork (1.0.0rc3)
|
spork (1.0.0rc3)
|
||||||
sprockets (2.2.1)
|
sprockets (2.2.2)
|
||||||
hike (~> 1.2)
|
hike (~> 1.2)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
rack (~> 1.0)
|
rack (~> 1.0)
|
||||||
|
|
@ -466,7 +466,7 @@ DEPENDENCIES
|
||||||
rack-protection (= 1.2)
|
rack-protection (= 1.2)
|
||||||
rack-rewrite (= 1.3.1)
|
rack-rewrite (= 1.3.1)
|
||||||
rack-ssl (= 1.3.2)
|
rack-ssl (= 1.3.2)
|
||||||
rails (= 3.2.9)
|
rails (= 3.2.10)
|
||||||
rails-i18n (= 0.7.0)
|
rails-i18n (= 0.7.0)
|
||||||
rails_admin (= 0.2.0)
|
rails_admin (= 0.2.0)
|
||||||
rails_autolink (= 1.0.9)
|
rails_autolink (= 1.0.9)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue