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

Merge branch 'hotfix/0.0.2.2' into develop

Browse source 
Conflicts:
	Changelog.md
	config/defaults.yml
This commit is contained in:
Jonne Haß 2013-01-09 00:11:29 +01:00
commit a09a8cbffc
3 changed files with 32 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Changelog.md
View file

@ -1,3 +1,4 @@
<<<<<<< HEAD
# 0.0.3.0 # 0.0.3.0
## Refactor ## Refactor
@ -42,6 +43,10 @@
* 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.2
* Upgrade to Rails 3.2.11 (CVE-2012-0155, CVE-2012-0156). [Read more](http://weblog.rubyonrails.org/2013/1/8/Rails-3-2-11-3-1-10-3-0-19-and-2-3-15-have-been-released/)
# 0.0.2.1 # 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) * Upgrade to Rails 3.2.10 as per CVE-2012-5664. [Read more](https://groups.google.com/group/rubyonrails-security/browse_thread/thread/c2353369fea8c53)

2
Gemfile
View file

@ -1,6 +1,6 @@
source 'http://rubygems.org' source 'http://rubygems.org'
gem 'rails', '3.2.10' gem 'rails', '3.2.11'
gem 'foreman', '0.60.2' gem 'foreman', '0.60.2'

52
Gemfile.lock
View file

@ -17,12 +17,12 @@ GIT
GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
actionmailer (3.2.10) actionmailer (3.2.11)
actionpack (= 3.2.10) actionpack (= 3.2.11)
mail (~> 2.4.4) mail (~> 2.4.4)
actionpack (3.2.10) actionpack (3.2.11)
activemodel (= 3.2.10) activemodel (= 3.2.11)
activesupport (= 3.2.10) activesupport (= 3.2.11)
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.10) activemodel (3.2.11)
activesupport (= 3.2.10) activesupport (= 3.2.11)
builder (~> 3.0.0) builder (~> 3.0.0)
activerecord (3.2.10) activerecord (3.2.11)
activemodel (= 3.2.10) activemodel (= 3.2.11)
activesupport (= 3.2.10) activesupport (= 3.2.11)
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.10) activeresource (3.2.11)
activemodel (= 3.2.10) activemodel (= 3.2.11)
activesupport (= 3.2.10) activesupport (= 3.2.11)
activesupport (3.2.10) activesupport (3.2.11)
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)
@ -265,7 +265,7 @@ GEM
coderay (~> 1.0.5) coderay (~> 1.0.5)
method_source (~> 0.8) method_source (~> 0.8)
slop (~> 3.3.1) slop (~> 3.3.1)
rack (1.4.1) rack (1.4.3)
rack-cache (1.2) rack-cache (1.2)
rack (>= 0.4) rack (>= 0.4)
rack-cors (0.2.7) rack-cors (0.2.7)
@ -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.10) rails (3.2.11)
actionmailer (= 3.2.10) actionmailer (= 3.2.11)
actionpack (= 3.2.10) actionpack (= 3.2.11)
activerecord (= 3.2.10) activerecord (= 3.2.11)
activeresource (= 3.2.10) activeresource (= 3.2.11)
activesupport (= 3.2.10) activesupport (= 3.2.11)
bundler (~> 1.0) bundler (~> 1.0)
railties (= 3.2.10) railties (= 3.2.11)
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,9 +310,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.10) railties (3.2.11)
actionpack (= 3.2.10) actionpack (= 3.2.11)
activesupport (= 3.2.10) activesupport (= 3.2.11)
rack-ssl (~> 1.3.2) rack-ssl (~> 1.3.2)
rake (>= 0.8.7) rake (>= 0.8.7)
rdoc (~> 3.4) rdoc (~> 3.4)
@ -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.10) rails (= 3.2.11)
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)