Revert "Merge branch '18193-developers-can-merge' into 'master'

This reverts commit 9ca633eb, reversing
changes made to fb229bbf.

CHANGELOG

@@ -44,7 +44,6 @@ v 8.10.0 (unreleased)
   - Add "Enabled Git access protocols" to Application Settings
   - Diffs will create button/diff form on demand no on server side
   - Reduce size of HTML used by diff comment forms
-  - Protected branches have a "Developers can Merge" setting. !4892 (original implementation by Mathias Vestergaard)
   - Fix user creation with stronger minimum password requirements !4054 (nathan-pmt)
   - Only show New Snippet button to users that can create snippets.
   - PipelinesFinder uses git cache data

app/assets/javascripts/protected_branches.js.coffee

 $ ->
   $(".protected-branches-list :checkbox").change (e) ->
     name = $(this).attr("name")
-    if name == "developers_can_push" || name == "developers_can_merge"
+    if name == "developers_can_push"
       id = $(this).val()
-      can_push = $(this).is(":checked")
+      checked = $(this).is(":checked")
       url = $(this).data("url")
       $.ajax
-        type: "PATCH"
+        type: "PUT"
         url: url
         dataType: "json"
         data:
           id: id
           protected_branch:
-            "#{name}": can_push
+            developers_can_push: checked
 
         success: ->
           row = $(e.target)

app/controllers/projects/protected_branches_controller.rb

@@ -50,6 +50,6 @@ def load_protected_branch
   end
 
   def protected_branch_params
-    params.require(:protected_branch).permit(:name, :developers_can_push, :developers_can_merge)
+    params.require(:protected_branch).permit(:name, :developers_can_push)
   end
 end

app/helpers/branches_helper.rb

@@ -12,7 +12,7 @@ def can_remove_branch?(project, branch_name)
   def can_push_branch?(project, branch_name)
     return false unless project.repository.branch_exists?(branch_name)
 
-    ::Gitlab::UserAccess.new(current_user, project: project).can_push_to_branch?(branch_name)
+    ::Gitlab::GitAccess.new(current_user, project, 'web').can_push_to_branch?(branch_name)
   end
 
   def project_branches

app/models/merge_request.rb

@@ -552,13 +552,7 @@ def broken?
   end
 
   def can_be_merged_by?(user)
-    access = ::Gitlab::UserAccess.new(user, project: project)
-    access.can_push_to_branch?(target_branch) || access.can_merge_to_branch?(target_branch)
-  end
-
-  def can_be_merged_via_command_line_by?(user)
-    access = ::Gitlab::UserAccess.new(user, project: project)
-    access.can_push_to_branch?(target_branch)
+    ::Gitlab::GitAccess.new(user, project, 'web').can_push_to_branch?(target_branch)
   end
 
   def mergeable_ci_state?

app/models/project.rb

@@ -832,10 +832,6 @@ def developers_can_push_to_protected_branch?(branch_name)
     protected_branches.matching(branch_name).any?(&:developers_can_push)
   end
 
-  def developers_can_merge_to_protected_branch?(branch_name)
-    protected_branches.matching(branch_name).any?(&:developers_can_merge)
-  end
-
   def forked?
     !(forked_project_link.nil? || forked_project_link.forked_from_project.nil?)
   end

app/models/repository.rb

@@ -769,9 +769,9 @@ def can_be_merged?(source_sha, target_branch)
     end
   end
 
-  def merge(user, merge_request, options = {})
-    our_commit = rugged.branches[merge_request.target_branch].target
-    their_commit = rugged.lookup(merge_request.diff_head_sha)
+  def merge(user, source_sha, target_branch, options = {})
+    our_commit = rugged.branches[target_branch].target
+    their_commit = rugged.lookup(source_sha)
 
     raise "Invalid merge target" if our_commit.nil?
     raise "Invalid merge source" if their_commit.nil?
@@ -779,16 +779,14 @@ def merge(user, merge_request, options = {})
     merge_index = rugged.merge_commits(our_commit, their_commit)
     return false if merge_index.conflicts?
 
-    commit_with_hooks(user, merge_request.target_branch) do |tmp_ref|
+    commit_with_hooks(user, target_branch) do |ref|
       actual_options = options.merge(
         parents: [our_commit, their_commit],
         tree: merge_index.write_tree(rugged),
-        update_ref: tmp_ref
+        update_ref: ref
       )
 
-      commit_id = Rugged::Commit.create(rugged, actual_options)
-      merge_request.update(in_progress_merge_commit_sha: commit_id)
-      commit_id
+      Rugged::Commit.create(rugged, actual_options)
     end
   end
 

app/services/commits/change_service.rb

@@ -23,7 +23,7 @@ def commit
     private
 
     def check_push_permissions
-      allowed = ::Gitlab::UserAccess.new(current_user, project: project).can_push_to_branch?(@target_branch)
+      allowed = ::Gitlab::GitAccess.new(current_user, project, 'web').can_push_to_branch?(@target_branch)
 
       unless allowed
         raise ValidationError.new('You are not allowed to push into this branch')

app/services/files/base_service.rb

@@ -42,7 +42,7 @@ def raise_error(message)
     end
 
     def validate
-      allowed = ::Gitlab::UserAccess.new(current_user, project: project).can_push_to_branch?(@target_branch)
+      allowed = ::Gitlab::GitAccess.new(current_user, project, 'web').can_push_to_branch?(@target_branch)
 
       unless allowed
         raise_error("You are not allowed to push into this branch")

app/services/git_push_service.rb

@@ -89,8 +89,7 @@ def process_default_branch
     # Set protection on the default branch if configured
     if current_application_settings.default_branch_protection != PROTECTION_NONE
       developers_can_push = current_application_settings.default_branch_protection == PROTECTION_DEV_CAN_PUSH ? true : false
-      developers_can_merge = current_application_settings.default_branch_protection == PROTECTION_DEV_CAN_MERGE ? true : false
-      @project.protected_branches.create({ name: @project.default_branch, developers_can_push: developers_can_push, developers_can_merge: developers_can_merge })
+      @project.protected_branches.create({ name: @project.default_branch, developers_can_push: developers_can_push })
     end
   end
 

app/services/merge_requests/merge_service.rb

@@ -34,7 +34,7 @@ def commit
         committer: committer
       }
 
-      commit_id = repository.merge(current_user, merge_request, options)
+      commit_id = repository.merge(current_user, merge_request.diff_head_sha, merge_request.target_branch, options)
       merge_request.update(merge_commit_sha: commit_id)
     rescue GitHooksService::PreReceiveError => e
       merge_request.update(merge_error: e.message)
@@ -43,8 +43,6 @@ def commit
       merge_request.update(merge_error: "Something went wrong during merge")
       Rails.logger.error(e.message)
       false
-    ensure
-      merge_request.update(in_progress_merge_commit_sha: nil)
     end
 
     def after_merge

app/services/merge_requests/refresh_service.rb

@@ -48,7 +48,7 @@ def close_merge_requests
     end
 
     def force_push?
-      Gitlab::Checks::ForcePush.force_push?(@project, @oldrev, @newrev)
+      Gitlab::ForcePushCheck.force_push?(@project, @oldrev, @newrev)
     end
 
     # Refresh merge request diff if we push to source or target branch of merge request

app/views/projects/merge_requests/widget/open/_conflicts.html.haml

@@ -4,7 +4,7 @@
 
 %p
   Please resolve these conflicts or
-  - if @merge_request.can_be_merged_via_command_line_by?(current_user)
+  - if @merge_request.can_be_merged_by?(current_user)
     #{link_to "merge this request manually", "#modal_merge_info", class: "how_to_merge_link vlink", "data-toggle" => "modal"}.
   - else
     ask someone with write access to this repository to merge this request manually.

app/views/projects/protected_branches/_branches_list.html.haml

@@ -8,7 +8,6 @@
   .table-responsive
     %table.table.protected-branches-list
       %colgroup
-        %col{ width: "20%" }
         %col{ width: "30%" }
         %col{ width: "25%" }
         %col{ width: "25%" }
@@ -19,7 +18,6 @@
           %th Protected Branch
           %th Commit
           %th Developers Can Push
-          %th Developers Can Merge
           - if can_admin_project
             %th
       %tbody

app/views/projects/protected_branches/_protected_branch.html.haml

@@ -16,8 +16,6 @@
         (branch was removed from repository)
   %td
     = check_box_tag("developers_can_push", protected_branch.id, protected_branch.developers_can_push, data: { url: url })
-  %td
-    = check_box_tag("developers_can_merge", protected_branch.id, protected_branch.developers_can_merge, data: { url: url })
   - if can_admin_project
     %td
       = link_to 'Unprotect', [@project.namespace.becomes(Namespace), @project, protected_branch], data: { confirm: 'Branch will be writable for developers. Are you sure?' }, method: :delete, class: "btn btn-warning btn-sm pull-right"

app/views/projects/protected_branches/index.html.haml

@@ -36,14 +36,6 @@
             = f.label :developers_can_push, "Developers can push", class: "label-light append-bottom-0"
             %p.light.append-bottom-0
               Allow developers to push to this branch
-
-        .form-group
-          = f.check_box :developers_can_merge, class: "pull-left"
-          .prepend-left-20
-            = f.label :developers_can_merge, "Developers can merge", class: "label-light append-bottom-0"
-            %p.light.append-bottom-0
-              Allow developers to accept merge requests to this branch
         = f.submit "Protect", class: "btn-create btn protect-branch-btn", disabled: true
-
     %hr
     = render "branches_list"

db/migrate/20160519203051_add_developers_can_merge_to_protected_branches.rb

-class AddDevelopersCanMergeToProtectedBranches < ActiveRecord::Migration
-  include Gitlab::Database::MigrationHelpers
-
-  disable_ddl_transaction!
-
-  def change
-    add_column_with_default :protected_branches, :developers_can_merge, :boolean, default: false, allow_null: false
-  end
-end

db/migrate/20160629025435_add_column_in_progress_merge_commit_sha_to_merge_requests.rb

-# See http://doc.gitlab.com/ce/development/migration_style_guide.html
-# for more information on how to write migrations for GitLab.
-
-class AddColumnInProgressMergeCommitShaToMergeRequests < ActiveRecord::Migration
-  def change
-    add_column :merge_requests, :in_progress_merge_commit_sha, :string
-  end
-end

db/schema.rb

@@ -626,7 +626,6 @@
     t.string   "merge_commit_sha"
     t.datetime "deleted_at"
     t.integer  "lock_version",              default: 0,     null: false
-    t.string   "in_progress_merge_commit_sha"
   end
 
   add_index "merge_requests", ["assignee_id"], name: "index_merge_requests_on_assignee_id", using: :btree
@@ -866,7 +865,6 @@
     t.datetime "created_at"
     t.datetime "updated_at"
     t.boolean  "developers_can_push", default: false, null: false
-    t.boolean  "developers_can_merge", default: false, null: false
   end
 
   add_index "protected_branches", ["project_id"], name: "index_protected_branches_on_project_id", using: :btree

lib/api/helpers.rb

@@ -17,7 +17,7 @@ def find_user_by_private_token
     def current_user
       @current_user ||= (find_user_by_private_token || doorkeeper_guard)
 
-      unless @current_user && Gitlab::UserAccess.new(@current_user).allowed?
+      unless @current_user && Gitlab::UserAccess.allowed?(@current_user)
         return nil
       end
 

lib/gitlab/access.rb

@@ -17,7 +17,6 @@ class AccessDeniedError < StandardError; end
     PROTECTION_NONE         = 0
     PROTECTION_DEV_CAN_PUSH = 1
     PROTECTION_FULL         = 2
-    PROTECTION_DEV_CAN_MERGE = 3
 
     class << self
       def values
@@ -55,7 +54,6 @@ def sym_options
       def protection_options
         {
           "Not protected: Both developers and masters can push new commits, force push, or delete the branch." => PROTECTION_NONE,
-          "Protected against pushes: Developers cannot push new commits, but are allowed to accept merge requests to the branch." => PROTECTION_DEV_CAN_MERGE,
           "Partially protected: Developers can push new commits, but cannot force push or delete the branch. Masters can do all of those." => PROTECTION_DEV_CAN_PUSH,
           "Fully protected: Developers cannot push new commits, force push, or delete the branch. Only masters can do any of those." => PROTECTION_FULL,
         }

lib/gitlab/checks/change_access.rb

-module Gitlab
-  module Checks
-    class ChangeAccess
-      attr_reader :user_access, :project
-
-      def initialize(change, user_access:, project:)
-        @oldrev, @newrev, @ref = change.split(' ')
-        @branch_name = branch_name(@ref)
-        @user_access = user_access
-        @project = project
-      end
-
-      def exec
-        error = protected_branch_checks || tag_checks || push_checks
-
-        if error
-          GitAccessStatus.new(false, error)
-        else
-          GitAccessStatus.new(true)
-        end
-      end
-
-      protected
-
-      def protected_branch_checks
-        return unless project.protected_branch?(@branch_name)
-
-        if forced_push? && user_access.cannot_do_action?(:force_push_code_to_protected_branches)
-          return "You are not allowed to force push code to a protected branch on this project."
-        elsif Gitlab::Git.blank_ref?(@newrev) && user_access.cannot_do_action?(:remove_protected_branches)
-          return "You are not allowed to delete protected branches from this project."
-        end
-
-        if matching_merge_request?
-          if user_access.can_merge_to_branch?(@branch_name) || user_access.can_push_to_branch?(@branch_name)
-            return
-          else
-            "You are not allowed to merge code into protected branches on this project."
-          end
-        else
-          if user_access.can_push_to_branch?(@branch_name)
-            return
-          else
-            "You are not allowed to push code to protected branches on this project."
-          end
-        end
-      end
-
-      def tag_checks
-        tag_ref = tag_name(@ref)
-
-        if tag_ref && protected_tag?(tag_ref) && user_access.cannot_do_action?(:admin_project)
-          "You are not allowed to change existing tags on this project."
-        end
-      end
-
-      def push_checks
-        if user_access.cannot_do_action?(:push_code)
-          "You are not allowed to push code to this project."
-        end
-      end
-
-      private
-
-      def protected_tag?(tag_name)
-        project.repository.tag_exists?(tag_name)
-      end
-
-      def forced_push?
-        Gitlab::Checks::ForcePush.force_push?(@project, @oldrev, @newrev)
-      end
-
-      def matching_merge_request?
-        Checks::MatchingMergeRequest.new(@newrev, @branch_name, @project).match?
-      end
-
-      def branch_name(ref)
-        ref = @ref.to_s
-        if Gitlab::Git.branch_ref?(ref)
-          Gitlab::Git.ref_name(ref)
-        else
-          nil
-        end
-      end
-
-      def tag_name(ref)
-        ref = @ref.to_s
-        if Gitlab::Git.tag_ref?(ref)
-          Gitlab::Git.ref_name(ref)
-        else
-          nil
-        end
-      end
-    end
-  end
-end

lib/gitlab/checks/force_push.rb

-module Gitlab
-  module Checks
-    class ForcePush
-      def self.force_push?(project, oldrev, newrev)
-        return false if project.empty_repo?
-
-        # Created or deleted branch
-        if Gitlab::Git.blank_ref?(oldrev) || Gitlab::Git.blank_ref?(newrev)
-          false
-        else
-          missed_refs, _ = Gitlab::Popen.popen(%W(#{Gitlab.config.git.bin_path} --git-dir=#{project.repository.path_to_repo} rev-list #{oldrev} ^#{newrev}))
-          missed_refs.split("\n").size > 0
-        end
-      end
-    end
-  end
-end

lib/gitlab/checks/matching_merge_request.rb

-module Gitlab
-  module Checks
-    class MatchingMergeRequest
-      def initialize(newrev, branch_name, project)
-        @newrev = newrev
-        @branch_name = branch_name
-        @project = project
-      end
-
-      def match?
-        @project.merge_requests
-          .with_state(:locked)
-          .where(in_progress_merge_commit_sha: @newrev, target_branch: @branch_name)
-          .exists?
-      end
-    end
-  end
-end

lib/gitlab/force_push_check.rb

+module Gitlab
+  class ForcePushCheck
+    def self.force_push?(project, oldrev, newrev)
+      return false if project.empty_repo?
+
+      # Created or deleted branch
+      if Gitlab::Git.blank_ref?(oldrev) || Gitlab::Git.blank_ref?(newrev)
+        false
+      else
+        missed_refs, _ = Gitlab::Popen.popen(%W(#{Gitlab.config.git.bin_path} --git-dir=#{project.repository.path_to_repo} rev-list #{oldrev} ^#{newrev}))
+        missed_refs.split("\n").size > 0
+      end
+    end
+  end
+end

lib/gitlab/git_access.rb

-# Check a user's access to perform a git action. All public methods in this
-# class return an instance of `GitlabAccessStatus`
 module Gitlab
   class GitAccess
     DOWNLOAD_COMMANDS = %w{ git-upload-pack git-upload-archive }
     PUSH_COMMANDS = %w{ git-receive-pack }
 
-    attr_reader :actor, :project, :protocol, :user_access
+    attr_reader :actor, :project, :protocol
 
     def initialize(actor, project, protocol)
       @actor    = actor
       @project  = project
       @protocol = protocol
-      @user_access = UserAccess.new(user, project: project)
+    end
+
+    def user
+      return @user if defined?(@user)
+
+      @user =
+        case actor
+        when User
+          actor
+        when DeployKey
+          nil
+        when Key
+          actor.user
+        end
+    end
+
+    def deploy_key
+      actor if actor.is_a?(DeployKey)
+    end
+
+    def can_push_to_branch?(ref)
+      return false unless user
+
+      if project.protected_branch?(ref) && !project.developers_can_push_to_protected_branch?(ref)
+        user.can?(:push_code_to_protected_branches, project)
+      else
+        user.can?(:push_code, project)
+      end
+    end
+
+    def can_read_project?
+      if user
+        user.can?(:read_project, project)
+      elsif deploy_key
+        deploy_key.projects.include?(project)
+      else
+        false
+      end
     end
 
     def check(cmd, changes = nil)
@@ -21,11 +56,11 @@ def check(cmd, changes = nil)
         return build_status_object(false, "No user or key was provided.")
       end
 
-      if user && !user_access.allowed?
+      if user && !user_allowed?
         return build_status_object(false, "Your account has been blocked.")
       end
 
-      unless project && (user_access.can_read_project? || deploy_key_can_read_project?)
+      unless project && can_read_project?
         return build_status_object(false, 'The project you were looking for could not be found.')
       end
 
@@ -60,7 +95,7 @@ def push_access_check(changes)
     end
 
     def user_download_access_check
-      unless user_access.can_do_action?(:download_code)
+      unless user.can?(:download_code, project)
         return build_status_object(false, "You are not allowed to download code from this project.")
       end
 
@@ -90,8 +125,46 @@ def user_push_access_check(changes)
       build_status_object(true)
     end
 
+    def can_user_do_action?(action)
+      @permission_cache ||= {}
+      @permission_cache[action] ||= user.can?(action, project)
+    end
+
     def change_access_check(change)
-      Checks::ChangeAccess.new(change, user_access: user_access, project: project).exec
+      oldrev, newrev, ref = change.split(' ')
+
+      action =
+        if project.protected_branch?(branch_name(ref))
+          protected_branch_action(oldrev, newrev, branch_name(ref))
+        elsif (tag_ref = tag_name(ref)) && protected_tag?(tag_ref)
+          # Prevent any changes to existing git tag unless user has permissions
+          :admin_project
+        else
+          :push_code
+        end
+
+      unless can_user_do_action?(action)
+        status =
+          case action
+          when :force_push_code_to_protected_branches
+            build_status_object(false, "You are not allowed to force push code to a protected branch on this project.")
+          when :remove_protected_branches
+            build_status_object(false, "You are not allowed to deleted protected branches from this project.")
+          when :push_code_to_protected_branches
+            build_status_object(false, "You are not allowed to push code to protected branches on this project.")
+          when :admin_project
+            build_status_object(false, "You are not allowed to change existing tags on this project.")
+          else # :push_code
+            build_status_object(false, "You are not allowed to push code to this project.")
+          end
+        return status
+      end
+
+      build_status_object(true)
+    end
+
+    def forced_push?(oldrev, newrev)
+      Gitlab::ForcePushCheck.force_push?(project, oldrev, newrev)
     end
 
     def protocol_allowed?
@@ -100,38 +173,48 @@ def protocol_allowed?
 
     private
 
-    def matching_merge_request?(newrev, branch_name)
-      Checks::MatchingMergeRequest.new(newrev, branch_name, project).match?
+    def protected_branch_action(oldrev, newrev, branch_name)
+      # we dont allow force push to protected branch
+      if forced_push?(oldrev, newrev)
+        :force_push_code_to_protected_branches
+      elsif Gitlab::Git.blank_ref?(newrev)
+        # and we dont allow remove of protected branch
+        :remove_protected_branches
+      elsif project.developers_can_push_to_protected_branch?(branch_name)
+        :push_code
+      else
+        :push_code_to_protected_branches
+      end
     end
 
-    def deploy_key
-      actor if actor.is_a?(DeployKey)
+    def protected_tag?(tag_name)
+      project.repository.tag_exists?(tag_name)
     end
 
-    def deploy_key_can_read_project?
-      if deploy_key
-        deploy_key.projects.include?(project)
+    def user_allowed?
+      Gitlab::UserAccess.allowed?(user)
+    end
+
+    def branch_name(ref)
+      ref = ref.to_s
+      if Gitlab::Git.branch_ref?(ref)
+        Gitlab::Git.ref_name(ref)
       el