Merge branch 'stable' into develop

Changelog.md

@@ -46,6 +46,10 @@ Ruby 2.0 is no longer officially supported.
 * Added link to diasporafoundation.org to invitation email [#5893](https://github.com/diaspora/diaspora/pull/5893)
 * Gracefully handle missing `og:url`s [#5926](https://github.com/diaspora/diaspora/pull/5926)
 
+# 0.5.0.1
+
+Use the correct setting for captcha length instead of defaulting to 1 always.
+
 # 0.5.0.0
 
 ## Major Sidekiq update

config/defaults.yml

@@ -4,7 +4,7 @@
 
 defaults:
   version:
-    number: "0.5.99.0" # Do not touch unless doing a release, do not backport the version number that's in master but keep develop to always say "head"
+    number: "0.5.99.0" # Do not touch unless doing a release, do not backport the version number that's in master
   heroku: false
   environment:
     url: "http://localhost:3000/"

config/initializers/setup_simple_captcha.rb

@@ -1,6 +1,6 @@
 SimpleCaptcha.setup do |sc|
   sc.image_size = AppConfig.settings.captcha.image_size
-  sc.length = [1, [AppConfig.settings.captcha_length.to_i, 12].min].max
+  sc.length = [1, [AppConfig.settings.captcha.captcha_length.to_i, 12].min].max
   sc.image_style = AppConfig.settings.captcha.image_style
   sc.distortion = AppConfig.settings.captcha.distortion
 end

spec/configuration_methods_spec.rb

@@ -0,0 +1,7 @@
+require "spec_helper"
+
+describe "ensure configuration effects" do
+  it "sets the captcha length as required" do
+    expect(SimpleCaptcha.length).to eq(AppConfig.settings.captcha.captcha_length.to_i)
+  end
+end