Add latest changes from gitlab-org/gitlab@12-0-stable-ee

app/controllers/passwords_controller.rb

@@ -64,3 +64,5 @@ class PasswordsController < Devise::PasswordsController
       notice: I18n.t('devise.passwords.send_paranoid_instructions')
   end
 end
+
+PasswordsController.prepend(EE::PasswordsController)

app/controllers/profiles/accounts_controller.rb

@@ -30,3 +30,5 @@ class Profiles::AccountsController < Profiles::ApplicationController
     {}
   end
 end
+
+Profiles::AccountsController.prepend(EE::Profiles::AccountsController)

app/controllers/profiles/preferences_controller.rb

@@ -50,3 +50,5 @@ class Profiles::PreferencesController < Profiles::ApplicationController
     ]
   end
 end
+
+Profiles::PreferencesController.prepend(::EE::Profiles::PreferencesController)

app/controllers/projects/autocomplete_sources_controller.rb

@@ -43,3 +43,5 @@ class Projects::AutocompleteSourcesController < Projects::ApplicationController
       .execute(params[:type], params[:type_id])
   end
 end
+
+Projects::AutocompleteSourcesController.prepend(EE::Projects::AutocompleteSourcesController)

app/controllers/projects/environments_controller.rb

@@ -244,3 +244,5 @@ class Projects::EnvironmentsController < Projects::ApplicationController
     access_denied! unless can?(current_user, :stop_environment, environment)
   end
 end
+
+Projects::EnvironmentsController.prepend(EE::Projects::EnvironmentsController)

app/controllers/projects/git_http_client_controller.rb

@@ -114,3 +114,5 @@ class Projects::GitHttpClientController < Projects::ApplicationController
     authentication_result.ci?(project)
   end
 end
+
+Projects::GitHttpClientController.prepend(EE::Projects::GitHttpClientController)

app/controllers/projects/git_http_controller.rb

@@ -110,3 +110,5 @@ class Projects::GitHttpController < Projects::GitHttpClientController
     Users::ActivityService.new(user, 'pull').execute
   end
 end
+
+Projects::GitHttpController.prepend(EE::Projects::GitHttpController)

app/controllers/projects/group_links_controller.rb

@@ -53,3 +53,5 @@ class Projects::GroupLinksController < Projects::ApplicationController
     params.permit(:link_group_access, :expires_at)
   end
 end
+
+Projects::GroupLinksController.prepend(EE::Projects::GroupLinksController)

app/controllers/projects/imports_controller.rb

@@ -77,3 +77,5 @@ class Projects::ImportsController < Projects::ApplicationController
       .merge(import_url_params)
   end
 end
+
+Projects::ImportsController.prepend(EE::Projects::ImportsController)

app/controllers/projects/issues_controller.rb

@@ -271,3 +271,5 @@ class Projects::IssuesController < Projects::ApplicationController
     push_frontend_feature_flag(:graphql, default_enabled: true)
   end
 end
+
+Projects::IssuesController.prepend(EE::Projects::IssuesController)

app/controllers/projects/jobs_controller.rb

@@ -208,3 +208,5 @@ class Projects::JobsController < Projects::ApplicationController
     'attachment'
   end
 end
+
+Projects::JobsController.prepend(EE::Projects::JobsController)

app/controllers/projects/lfs_api_controller.rb

@@ -123,3 +123,5 @@ class Projects::LfsApiController < Projects::GitHttpClientController
     _('You cannot write to this read-only GitLab instance.')
   end
 end
+
+Projects::LfsApiController.prepend(EE::Projects::LfsApiController)

app/controllers/projects/merge_requests/application_controller.rb

@@ -52,3 +52,5 @@ class Projects::MergeRequests::ApplicationController < Projects::ApplicationCont
       end
   end
 end
+
+Projects::MergeRequests::ApplicationController.prepend(EE::Projects::MergeRequests::ApplicationController)

app/controllers/projects/merge_requests/diffs_controller.rb

@@ -117,3 +117,5 @@ class Projects::MergeRequests::DiffsController < Projects::MergeRequests::Applic
     @notes
   end
 end
+
+Projects::MergeRequests::DiffsController.prepend(EE::Projects::MergeRequests::DiffsController)

app/controllers/projects/merge_requests_controller.rb

@@ -360,3 +360,5 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
     return render_404 unless can?(current_user, :read_build, merge_request.actual_head_pipeline)
   end
 end
+
+Projects::MergeRequestsController.prepend(EE::Projects::MergeRequestsController)

app/controllers/projects/mirrors_controller.rb

@@ -90,3 +90,5 @@ class Projects::MirrorsController < Projects::ApplicationController
     params.require(:project).permit(mirror_params_attributes)
   end
 end
+
+Projects::MirrorsController.prepend(EE::Projects::MirrorsController)

app/controllers/projects/pipelines_controller.rb

@@ -197,3 +197,5 @@ class Projects::PipelinesController < Projects::ApplicationController
     view_context.limited_counter_with_delimiter(finder.execute)
   end
 end
+
+Projects::PipelinesController.prepend(EE::Projects::PipelinesController)

app/controllers/projects/project_members_controller.rb

@@ -7,6 +7,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
   # Authorize
   before_action :authorize_admin_project_member!, except: [:index, :leave, :request_access]
+  before_action :check_membership_lock!, only: [:create, :import, :apply_import]
   # rubocop: disable CodeReuse/ActiveRecord
   def index
@@ -50,4 +51,8 @@ class Projects::ProjectMembersController < Projects::ApplicationController
   # MembershipActions concern
   alias_method :membershipable, :project
+
+  def check_membership_lock!
+    access_denied!('Membership is locked by group settings') if membership_locked?
+  end
 end

app/controllers/projects/prometheus/metrics_controller.rb

@@ -32,3 +32,5 @@ module Projects
     end
   end
 end
+
+Projects::Prometheus::MetricsController.prepend(EE::Projects::Prometheus::MetricsController)

app/controllers/projects/protected_refs_controller.rb

@@ -65,3 +65,5 @@ class Projects::ProtectedRefsController < Projects::ApplicationController
     %i[access_level id]
   end
 end
+
+Projects::ProtectedRefsController.prepend(EE::Projects::ProtectedRefsController)