Skip to content
Snippets Groups Projects
Commit fe022014 authored by Alessio Caiazza's avatar Alessio Caiazza
Browse files

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

This reverts commit a21e4112
parent a21e4112
No related branches found
No related tags found
No related merge requests found
Showing
with 0 additions and 40 deletions
Loading
Loading
@@ -122,5 +122,3 @@ module Projects
end
end
end
Projects::Settings::CiCdController.prepend(EE::Projects::Settings::CiCdController)
Loading
Loading
@@ -25,5 +25,3 @@ module Projects
end
end
end
Projects::Settings::IntegrationsController.prepend(EE::Projects::Settings::IntegrationsController)
Loading
Loading
@@ -69,5 +69,3 @@ module Projects
end
end
end
Projects::Settings::OperationsController.prepend(::EE::Projects::Settings::OperationsController)
Loading
Loading
@@ -104,5 +104,3 @@ module Projects
end
end
end
Projects::Settings::RepositoryController.prepend(EE::Projects::Settings::RepositoryController)
Loading
Loading
@@ -41,5 +41,3 @@ class Projects::VariablesController < Projects::ApplicationController
%i[id variable_type key secret_value protected masked _destroy]
end
end
Projects::VariablesController.prepend(EE::Projects::VariablesController)
Loading
Loading
@@ -462,5 +462,3 @@ class ProjectsController < Projects::ApplicationController
end
end
end
ProjectsController.prepend(EE::ProjectsController)
Loading
Loading
@@ -126,5 +126,3 @@ class RegistrationsController < Devise::RegistrationsController
Gitlab::Utils.to_boolean(params[:terms_opt_in])
end
end
RegistrationsController.prepend(EE::RegistrationsController)
Loading
Loading
@@ -62,5 +62,3 @@ class RootController < Dashboard::ProjectsController
root_urls.exclude?(home_page_url)
end
end
RootController.prepend(EE::RootController)
Loading
Loading
@@ -36,5 +36,3 @@ class SentNotificationsController < ApplicationController
end
end
end
SentNotificationsController.prepend(EE::SentNotificationsController)
Loading
Loading
@@ -279,5 +279,3 @@ class SessionsController < Devise::SessionsController
end
end
end
SessionsController.prepend(EE::SessionsController)
Loading
Loading
@@ -167,5 +167,3 @@ class UsersController < ApplicationController
access_denied! unless can?(current_user, :read_user_profile, user)
end
end
UsersController.prepend(EE::UsersController)
Loading
Loading
@@ -93,5 +93,3 @@ module Autocomplete
end
end
end
Autocomplete::UsersFinder.prepend(EE::Autocomplete::UsersFinder)
Loading
Loading
@@ -34,5 +34,3 @@ class GroupMembersFinder
end
# rubocop: enable CodeReuse/ActiveRecord
end
GroupMembersFinder.prepend(EE::GroupMembersFinder)
Loading
Loading
@@ -145,5 +145,3 @@ class IssuesFinder < IssuableFinder
current_user.blank?
end
end
IssuesFinder.prepend(EE::IssuesFinder)
Loading
Loading
@@ -13,8 +13,6 @@
class LicenseTemplateFinder
include Gitlab::Utils::StrongMemoize
 
prepend ::EE::LicenseTemplateFinder # rubocop: disable Cop/InjectEnterpriseEditionModule
attr_reader :project, :params
 
def initialize(project, params = {})
Loading
Loading
Loading
Loading
@@ -101,5 +101,3 @@ class MergeRequestsFinder < IssuableFinder
.or(table[:title].matches('[WIP]%'))
end
end
MergeRequestsFinder.prepend(EE::MergeRequestsFinder)
Loading
Loading
@@ -141,5 +141,3 @@ class NotesFinder
@params[:notes_filter].present?
end
end
NotesFinder.prepend(EE::NotesFinder)
Loading
Loading
@@ -24,8 +24,6 @@
class ProjectsFinder < UnionFinder
include CustomAttributesFilter
 
prepend ::EE::ProjectsFinder # rubocop: disable Cop/InjectEnterpriseEditionModule
attr_accessor :params
attr_reader :current_user, :project_ids_relation
 
Loading
Loading
Loading
Loading
@@ -3,8 +3,6 @@
class TemplateFinder
include Gitlab::Utils::StrongMemoize
 
prepend ::EE::TemplateFinder # rubocop: disable Cop/InjectEnterpriseEditionModule
VENDORED_TEMPLATES = HashWithIndifferentAccess.new(
dockerfiles: ::Gitlab::Template::DockerfileTemplate,
gitignores: ::Gitlab::Template::GitignoreTemplate,
Loading
Loading
Loading
Loading
@@ -95,5 +95,3 @@ class UsersFinder
end
end
end
UsersFinder.prepend(EE::UsersFinder)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment