Merge branch 'master' into collections-sprint

# Conflicts:
#	app/views/hyrax/dashboard/collections/_show_actions.html.erb

README.md

@@ -143,7 +143,7 @@ Hyrax requires Rails 5. We recommend the latest Rails 5.0 release.
 
 ```
 # If you don't already have Rails at your disposal...
-gem install rails -v 5.0.3
+gem install rails -v 5.0.5
 ```
 
 ### JavaScript runtime
@@ -159,7 +159,7 @@ NOTE: The steps need to be done in order to create a new Hyrax based app.
 Generate a new Rails application using the template.
 
 ```
-rails _5.0.3_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/master/template.rb
+rails _5.0.5_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/master/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:

app/views/hyrax/dashboard/collections/_edit_actions.html.erb

@@ -3,5 +3,6 @@
   <%= link_to t('hyrax.collection.actions.add_works.label'),
               hyrax.my_works_path(add_works_to_collection: @form.id),
               title: t('hyrax.collection.actions.add_works.desc'),
-              class: 'btn btn-default' %>
+              class: 'btn btn-default',
+              data: { turbolinks: false } %>
 </div>

spec/spec_helper.rb

@@ -39,9 +39,19 @@ def coverage_needed?
 require 'equivalent-xml'
 require 'equivalent-xml/rspec_matchers'
 require 'database_cleaner'
-# See https://github.com/jeremyf/capybara-maleficent
-# Wrap Capybara matchers with sleep intervals to reduce fragility of specs.
-require 'capybara/maleficent/spindle'
+
+unless ENV['SKIP_MALEFICENT']
+  # See https://github.com/jeremyf/capybara-maleficent
+  # Wrap Capybara matchers with sleep intervals to reduce fragility of specs.
+  require 'capybara/maleficent/spindle'
+
+  Capybara::Maleficent.config do |c|
+    # Quieting down maleficent's logging
+    logger = Logger.new(STDOUT)
+    logger.level = Logger::INFO
+    c.logger = logger
+  end
+end
 
 # Require supporting ruby files from spec/support/ and subdirectories.  Note: engine, not Rails.root context.
 Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each { |f| require f }