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

Merge branch 'hotfix/0.0.3.3'

Browse source
This commit is contained in:
Jonne Haß 2013-03-11 21:23:43 +01:00
commit 2ca35fbb24
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Changelog.md
View file

@ -1,3 +1,7 @@
# 0.0.3.3
* Switch Gemfile source to https to be compatible with bundler 1.3
# 0.0.3.2 # 0.0.3.2
* Fix XSS vulnerability in conversations#new [#4010](https://github.com/diaspora/diaspora/issues/4010) * Fix XSS vulnerability in conversations#new [#4010](https://github.com/diaspora/diaspora/issues/4010)

2
Gemfile
View file

@ -1,4 +1,4 @@
source 'http://rubygems.org' source 'https://rubygems.org'
gem 'rails', '3.2.12' gem 'rails', '3.2.12'

2
Gemfile.lock
View file

@ -8,7 +8,7 @@ GIT
nokogiri (>= 1.3.3) nokogiri (>= 1.3.3)
GEM GEM
remote: http://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionmailer (3.2.12) actionmailer (3.2.12)
actionpack (= 3.2.12) actionpack (= 3.2.12)

2
config/defaults.yml
View file

@ -4,7 +4,7 @@
defaults: defaults:
version: version:
number: "0.0.3.2" number: "0.0.3.3"
heroku: false heroku: false
environment: environment:
url: "http://localhost:3000/" url: "http://localhost:3000/"