Merge branch 'master' into remove_investments_internal_comments

2018-01-31 13:47:15 +01:00
parent 679cf3943e ec81f399bf
commit 05a6406189
94 changed files with 1213 additions and 697 deletions
--- a/spec/features/valuation/budget_investments_spec.rb
+++ b/spec/features/valuation/budget_investments_spec.rb
@@ -16,7 +16,6 @@ feature 'Valuation budget investments' do
  end

  scenario 'Display link to valuation section' do
-    Setting['feature.budgets'] = true
    visit root_path
    expect(page).to have_link "Valuation", href: valuation_root_path
  end