Add latest changes from gitlab-org/gitlab@master

3 files changed, 5 insertions, 11 deletions

diff --git a/app/controllers/concerns/membership_actions.rb b/app/controllers/concerns/membership_actions.rb
index f660419375e..b4f5589a059 100644
--- a/app/controllers/concerns/membership_actions.rb
+++ b/app/controllers/concerns/membership_actions.rb
@@ -5,7 +5,6 @@ module MembershipActions
   extend ActiveSupport::Concern
 
   def update
-    update_params = params.require(root_params_key).permit(:access_level, :expires_at)
     member = members_and_requesters.find(params[:id])
     result = Members::UpdateService
       .new(current_user, update_params)
@@ -148,6 +147,10 @@ module MembershipActions
     membershipable.requesters
   end
 
+  def update_params
+    params.require(root_params_key).permit(:access_level, :expires_at)
+  end
+
   def requested_relations(inherited_permissions = :with_inherited_permissions)
     case params[inherited_permissions].presence
     when 'exclude'
diff --git a/app/models/member.rb b/app/models/member.rb
index 80a875fc04d..77e283044ea 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -523,6 +523,7 @@ class Member < ApplicationRecord
 
   def validate_access_level_locked_for_member_role
     return unless member_role_id
+    return if member_role_changed? # it is ok to change the access level when changing member role
 
     if access_level_changed?
       errors.add(:access_level, _("cannot be changed since member is associated with a custom role"))
diff --git a/app/presenters/ci/pipeline_presenter.rb b/app/presenters/ci/pipeline_presenter.rb
index 3b5bb2241c7..42368ec525b 100644
--- a/app/presenters/ci/pipeline_presenter.rb
+++ b/app/presenters/ci/pipeline_presenter.rb
@@ -133,16 +133,6 @@ module Ci
         end
       end
     end
-
-    def all_related_merge_requests
-      strong_memoize(:all_related_merge_requests) do
-        if pipeline.ref && can?(current_user, :read_merge_request, pipeline.project)
-          pipeline.all_merge_requests_by_recency.to_a
-        else
-          []
-        end
-      end
-    end
   end
 end