Add latest changes from gitlab-org/gitlab@master

app/controllers/ide_controller.rb

@@ -7,3 +7,5 @@ class IdeController < ApplicationController
     Gitlab::UsageDataCounters::WebIdeCounter.increment_views_count
   end
 end
+
+IdeController.prepend_if_ee('EE::IdeController')

app/controllers/import/github_controller.rb

@@ -186,3 +186,5 @@ class Import::GithubController < Import::BaseController
     {}
   end
 end
+
+Import::GithubController.prepend_if_ee('EE::Import::GithubController')

app/controllers/ldap/omniauth_callbacks_controller.rb

@@ -31,3 +31,5 @@ class Ldap::OmniauthCallbacksController < OmniauthCallbacksController
     redirect_to new_user_session_path
   end
 end
+
+Ldap::OmniauthCallbacksController.prepend_if_ee('EE::Ldap::OmniauthCallbacksController')

app/controllers/omniauth_callbacks_controller.rb

@@ -214,3 +214,5 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
     end
   end
 end
+
+OmniauthCallbacksController.prepend_if_ee('EE::OmniauthCallbacksController')

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_if_ee('EE::PasswordsController')

app/controllers/profiles/accounts_controller.rb

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

app/controllers/profiles/preferences_controller.rb

@@ -50,3 +50,5 @@ class Profiles::PreferencesController < Profiles::ApplicationController
     ]
   end
 end
+
+Profiles::PreferencesController.prepend_if_ee('::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_if_ee('EE::Projects::AutocompleteSourcesController')

app/controllers/projects/environments_controller.rb

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

app/controllers/projects/git_http_client_controller.rb

@@ -119,3 +119,5 @@ class Projects::GitHttpClientController < Projects::ApplicationController
     Gitlab::ProtocolAccess.allowed?('http')
   end
 end
+
+Projects::GitHttpClientController.prepend_if_ee('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_if_ee('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_if_ee('EE::Projects::GroupLinksController')

app/controllers/projects/imports_controller.rb

@@ -73,3 +73,5 @@ class Projects::ImportsController < Projects::ApplicationController
       .merge(import_url_params)
   end
 end
+
+Projects::ImportsController.prepend_if_ee('EE::Projects::ImportsController')

app/controllers/projects/issues_controller.rb

@@ -280,3 +280,5 @@ class Projects::IssuesController < Projects::ApplicationController
     Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42422')
   end
 end
+
+Projects::IssuesController.prepend_if_ee('EE::Projects::IssuesController')

app/controllers/projects/jobs_controller.rb

@@ -231,3 +231,5 @@ class Projects::JobsController < Projects::ApplicationController
     'attachment'
   end
 end
+
+Projects::JobsController.prepend_if_ee('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_if_ee('EE::Projects::LfsApiController')

app/controllers/projects/merge_requests/application_controller.rb

@@ -59,3 +59,5 @@ class Projects::MergeRequests::ApplicationController < Projects::ApplicationCont
     @merge_request.close
   end
 end
+
+Projects::MergeRequests::ApplicationController.prepend_if_ee('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_if_ee('EE::Projects::MergeRequests::DiffsController')

app/controllers/projects/merge_requests_controller.rb

@@ -351,3 +351,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_if_ee('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_if_ee('EE::Projects::MirrorsController')