Address final round of comments from @DouweM.

1. No need to change the spec for `UserAccess#can_push_to_branch?` for
   EE anymore.

2. Make the `dropdowns_helper` change additive to CE, so as to reduce
   the potential for merge conflicts.

app/helpers/dropdowns_helper.rb

@@ -7,10 +7,10 @@ module DropdownsHelper
         data_attr = options[:data].merge(data_attr)
       end
 
+      dropdown_output = dropdown_toggle(toggle_text, data_attr, options)
+
       if options.has_key?(:toggle_link)
         dropdown_output = dropdown_toggle_link(toggle_text, data_attr, options)
-      else
-        dropdown_output = dropdown_toggle(toggle_text, data_attr, options)
       end
 
       dropdown_output << content_tag(:div, class: "dropdown-menu dropdown-select #{options[:dropdown_class] if options.has_key?(:dropdown_class)}") do

spec/lib/gitlab/user_access_spec.rb

@@ -66,12 +66,12 @@ describe Gitlab::UserAccess, lib: true do
     end
 
     describe 'push to protected branch' do
-      let(:branch) { create :protected_branch, :remove_default_access_levels, project: project }
+      let(:branch) { create :protected_branch, project: project }
 
-      it 'returns false if user is a master' do
+      it 'returns true if user is a master' do
         project.team << [user, :master]
 
-        expect(access.can_push_to_branch?(branch.name)).to be_falsy
+        expect(access.can_push_to_branch?(branch.name)).to be_truthy
       end
 
       it 'returns false if user is a developer' do