Merge branch 'master' into polls

app/views/budgets/investments/_sidebar.html.erb

@@ -3,7 +3,7 @@
 <% if can?(:create, Budget::Investment.new(budget: @budget)) %>
   <% if current_user && current_user.level_two_or_three_verified? %>
     <%= link_to t("budgets.investments.index.sidebar.create"),
-               new_budget_investment_path, class: "button budget expanded" %>
+               new_budget_investment_path(budget_id: @budget.id), class: "button budget expanded" %>
   <% else %>
     <div class="callout warning">
       <%= t("budgets.investments.index.sidebar.verified_only",

spec/rails_helper.rb

@@ -26,6 +26,7 @@ end
 
 Capybara.register_driver :poltergeist do |app|
   Capybara::Poltergeist::Driver.new(app,
+    timeout: 1.minute,
     inspector: true, # allows remote debugging by executing page.driver.debug
     phantomjs_logger: File.open(File::NULL, "w"), # don't print console.log calls in console
     phantomjs_options: ['--load-images=no', '--disk-cache=false'],