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

Merge branch 'hotfix/0.0.2.3' into develop

Browse source 
Conflicts:
	Changelog.md
	Gemfile.lock
This commit is contained in:
Jonne Haß 2013-01-28 20:41:25 +01:00
commit 74613b0b15
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Changelog.md
View file

@ -83,6 +83,10 @@
* fixture_builder 0.3.4 -> 0.3.5 * fixture_builder 0.3.4 -> 0.3.5
* ffi 1.1.5 -> 1.3.1 * ffi 1.1.5 -> 1.3.1
# 0.0.2.3
* Upgrade to Devise 2.1.3 [Read more](http://blog.plataformatec.com.br/2013/01/security-announcement-devise-v2-2-3-v2-1-3-v2-0-5-and-v1-5-3-released/)
# 0.0.2.2 # 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/) * 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/)

2
Gemfile
View file

@ -21,7 +21,7 @@ gem 'rack-protection', '1.2'
# authentication # authentication
gem 'devise', '2.1.2' gem 'devise', '2.1.3'
gem 'remotipart', '1.0.2' gem 'remotipart', '1.0.2'

7
Gemfile.lock
View file

@ -95,7 +95,7 @@ GEM
cucumber (>= 1.1.8) cucumber (>= 1.1.8)
nokogiri (>= 1.5.0) nokogiri (>= 1.5.0)
database_cleaner (0.9.1) database_cleaner (0.9.1)
devise (2.1.2) devise (2.1.3)
bcrypt-ruby (~> 3.0) bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1) orm_adapter (~> 0.1)
railties (~> 3.1) railties (~> 3.1)
@ -373,7 +373,8 @@ GEM
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
subexec (0.2.2) subexec (0.2.2)
thor (0.16.0) sys-proctable (0.9.2)
thor (0.17.0)
tilt (1.3.3) tilt (1.3.3)
timecop (0.5.9) timecop (0.5.9)
treetop (1.4.12) treetop (1.4.12)
@ -423,7 +424,7 @@ DEPENDENCIES
configurate (= 0.0.1) configurate (= 0.0.1)
cucumber-rails (= 1.3.0) cucumber-rails (= 1.3.0)
database_cleaner (= 0.9.1) database_cleaner (= 0.9.1)
devise (= 2.1.2) devise (= 2.1.3)
factory_girl_rails (= 4.1.0) factory_girl_rails (= 4.1.0)
faraday (= 0.8.4) faraday (= 0.8.4)
faraday_middleware (= 0.9.0) faraday_middleware (= 0.9.0)