Merge branch 'master' into polls

2017-01-19 16:51:19 +01:00
parent 0e9cec2ca6 c918c9e081
commit 113f9b32d7
254 changed files with 10658 additions and 871 deletions
--- a/spec/features/admin/feature_flags_spec.rb
+++ b/spec/features/admin/feature_flags_spec.rb
@@ -3,6 +3,8 @@ require 'rails_helper'
 feature 'Admin feature flags' do

  background do
+    Setting["feature.spending_proposals"] = true
+    Setting['feature.spending_proposal_features.voting_allowed'] = true
    login_as(create(:administrator).user)
  end