Merge remote-tracking branch 'origin/master' into framework-ui

Author: scambra

app/views/active_scaffold_overrides/action_links_menu.js.erb

@@ -1 +1 @@
-<%= display_dynamic_action_group(@action_links, display_action_links(@action_links, @record, for: @record, output: []), @record) %>
+<%= display_dynamic_action_group(@action_links, display_action_links(@action_links, @record, for: @record, output: []).compact, @record) %>

lib/active_scaffold/helpers/action_link_helpers.rb

@@ -35,7 +35,7 @@ def display_action_links(action_links, record, options, &block)
         options[:options_level_0_tag] ||= nil
         options[:level] ||= 0
         options[:first_action] = true
-        output = options[:output] || ActiveSupport::SafeBuffer.new
+        output = options.delete(:output) || ActiveSupport::SafeBuffer.new
         prev_link = separator = nil
 
         action_links.each(reverse: options.delete(:reverse), groups: true) do |link|