Merge branch 'bvl-port-ee-improvements-from-maintainer-push' into 'master'

Port changes from EE: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4885 (Maintainer push to fork)

See merge request gitlab-org/gitlab-ce!17629

app/assets/javascripts/vue_merge_request_widget/components/mr_widget_maintainer_edit.vue

@@ -10,8 +10,9 @@
     },
   };
 </script>
+
 <template>
-  <section class="mr-info-list mr-maintainer-edit">
+  <section class="mr-info-list mr-links">
     <p v-if="maintainerEditAllowed">
       {{ s__("mrWidget|Allows edits from maintainers") }}
     </p>

app/assets/stylesheets/pages/merge_requests.scss

@@ -453,8 +453,7 @@
   }
 }
 
-.mr-links,
-.mr-maintainer-edit {
+.mr-links {
   padding-left: $status-icon-size + $status-icon-margin;
 }
 

doc/user/project/merge_requests/maintainer_access.md

-# Allow maintainer pushes for merge requests accross forks
+# Allow maintainer pushes for merge requests across forks
 
 This feature is available for merge requests across forked projects that are
 publicly accessible. It makes it easier for maintainers of projects to collaborate

lib/gitlab/user_access.rb

@@ -63,15 +63,12 @@ module Gitlab
 
     request_cache def can_push_to_branch?(ref)
       return false unless can_access_git?
+      return false unless user.can?(:push_code, project) || project.branch_allows_maintainer_push?(user, ref)
 
       if protected?(ProtectedBranch, project, ref)
-        return true if project.user_can_push_to_empty_repo?(user)
-
-        protected_branch_accessible_to?(ref, action: :push)
-      elsif user.can?(:push_code, project)
-        true
+        project.user_can_push_to_empty_repo?(user) || protected_branch_accessible_to?(ref, action: :push)
       else
-        project.branch_allows_maintainer_push?(user, ref)
+        true
       end
     end
 

spec/javascripts/vue_mr_widget/components/mr_widget_maintainer_edit_spec.js

@@ -2,22 +2,39 @@ import Vue from 'vue';
 import maintainerEditComponent from '~/vue_merge_request_widget/components/mr_widget_maintainer_edit.vue';
 import mountComponent from 'spec/helpers/vue_mount_component_helper';
 
-describe('MRWidgetAuthor', () => {
+describe('RWidgetMaintainerEdit', () => {
+  let Component;
   let vm;
 
   beforeEach(() => {
-    const Component = Vue.extend(maintainerEditComponent);
+    Component = Vue.extend(maintainerEditComponent);
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+  });
 
+  describe('when a maintainer is allowed to edit', () => {
+    beforeEach(() => {
       vm = mountComponent(Component, {
         maintainerEditAllowed: true,
       });
     });
 
-  afterEach(() => {
-    vm.$destroy();
+    it('it renders the message', () => {
+      expect(vm.$el.textContent.trim()).toEqual('Allows edits from maintainers');
+    });
   });
 
-  it('renders the message when maintainers are allowed to edit', () => {
-    expect(vm.$el.textContent.trim()).toEqual('Allows edits from maintainers');
+  describe('when a maintainer is not allowed to edit', () => {
+    beforeEach(() => {
+      vm = mountComponent(Component, {
+        maintainerEditAllowed: false,
+      });
+    });
+
+    it('hides the message', () => {
+      expect(vm.$el.textContent.trim()).toEqual('');
+    });
   });
 });