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_spec.rb
+++ b/spec/features/admin_spec.rb
@@ -65,6 +65,8 @@ feature 'Admin' do
  end

  scenario "Admin access links" do
+    Setting["feature.spending_proposals"] = true
+
    login_as(administrator)
    visit root_path