Merge branch 'hotfix/0.0.3.3'

2013-03-11 21:23:43 +01:00 · 2013-03-11 21:23:43 +01:00 · 2ca35fbb24
commit 2ca35fbb24
parent 3e32472dbb c7283c60a1
4 changed files with 7 additions and 3 deletions
--- a/Changelog.md
+++ b/Changelog.md
@ -1,3 +1,7 @@
+# 0.0.3.3
+
+* Switch Gemfile source to https to be compatible with bundler 1.3
+
 # 0.0.3.2

 * Fix XSS vulnerability in conversations#new [#4010](https://github.com/diaspora/diaspora/issues/4010)
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'

 gem 'rails', '3.2.12'

--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -8,7 +8,7 @@ GIT
      nokogiri (>= 1.3.3)

 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
  specs:
    actionmailer (3.2.12)
      actionpack (= 3.2.12)
--- a/config/defaults.yml
+++ b/config/defaults.yml
@ -4,7 +4,7 @@

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