Skip to content
Snippets Groups Projects
Commit b7dfe2ae authored by GitLab Bot's avatar GitLab Bot
Browse files

Add latest changes from gitlab-org/gitlab@master

parent 25cb337c
No related branches found
No related tags found
No related merge requests found
Showing
with 40 additions and 0 deletions
Loading
Loading
@@ -220,3 +220,5 @@ class Projects::PipelinesController < Projects::ApplicationController
view_context.limited_counter_with_delimiter(finder.execute)
end
end
Projects::PipelinesController.prepend_if_ee('EE::Projects::PipelinesController')
Loading
Loading
@@ -51,3 +51,5 @@ class Projects::ProjectMembersController < Projects::ApplicationController
# MembershipActions concern
alias_method :membershipable, :project
end
Projects::ProjectMembersController.prepend_if_ee('EE::Projects::ProjectMembersController')
Loading
Loading
@@ -32,3 +32,5 @@ module Projects
end
end
end
Projects::Prometheus::MetricsController.prepend_if_ee('EE::Projects::Prometheus::MetricsController')
Loading
Loading
@@ -65,3 +65,5 @@ class Projects::ProtectedRefsController < Projects::ApplicationController
%i[access_level id]
end
end
Projects::ProtectedRefsController.prepend_if_ee('EE::Projects::ProtectedRefsController')
Loading
Loading
@@ -90,3 +90,5 @@ class Projects::RepositoriesController < Projects::ApplicationController
render_404
end
end
Projects::RepositoriesController.prepend_if_ee('EE::Projects::RepositoriesController')
Loading
Loading
@@ -122,3 +122,5 @@ module Projects
end
end
end
Projects::Settings::CiCdController.prepend_if_ee('EE::Projects::Settings::CiCdController')
Loading
Loading
@@ -25,3 +25,5 @@ module Projects
end
end
end
Projects::Settings::IntegrationsController.prepend_if_ee('EE::Projects::Settings::IntegrationsController')
Loading
Loading
@@ -69,3 +69,5 @@ module Projects
end
end
end
Projects::Settings::OperationsController.prepend_if_ee('::EE::Projects::Settings::OperationsController')
Loading
Loading
@@ -104,3 +104,5 @@ module Projects
end
end
end
Projects::Settings::RepositoryController.prepend_if_ee('EE::Projects::Settings::RepositoryController')
Loading
Loading
@@ -464,3 +464,5 @@ class ProjectsController < Projects::ApplicationController
@project = @project.present(current_user: current_user)
end
end
ProjectsController.prepend_if_ee('EE::ProjectsController')
Loading
Loading
@@ -145,3 +145,5 @@ class RegistrationsController < Devise::RegistrationsController
stored_location_for(user) || dashboard_projects_path
end
end
RegistrationsController.prepend_if_ee('EE::RegistrationsController')
Loading
Loading
@@ -62,3 +62,5 @@ class RootController < Dashboard::ProjectsController
root_urls.exclude?(home_page_url)
end
end
RootController.prepend_if_ee('EE::RootController')
Loading
Loading
@@ -36,3 +36,5 @@ class SentNotificationsController < ApplicationController
end
end
end
SentNotificationsController.prepend_if_ee('EE::SentNotificationsController')
Loading
Loading
@@ -288,3 +288,5 @@ class SessionsController < Devise::SessionsController
end
end
end
SessionsController.prepend_if_ee('EE::SessionsController')
Loading
Loading
@@ -182,3 +182,5 @@ class UsersController < ApplicationController
access_denied! unless can?(current_user, :read_user_profile, user)
end
end
UsersController.prepend_if_ee('EE::UsersController')
Loading
Loading
@@ -93,3 +93,5 @@ module Autocomplete
end
end
end
Autocomplete::UsersFinder.prepend_if_ee('EE::Autocomplete::UsersFinder')
Loading
Loading
@@ -34,3 +34,5 @@ class GroupMembersFinder < UnionFinder
end
# rubocop: enable CodeReuse/ActiveRecord
end
GroupMembersFinder.prepend_if_ee('EE::GroupMembersFinder')
Loading
Loading
@@ -100,3 +100,5 @@ class GroupProjectsFinder < ProjectsFinder
group.shared_projects
end
end
GroupProjectsFinder.prepend_if_ee('EE::GroupProjectsFinder')
Loading
Loading
@@ -145,3 +145,5 @@ class IssuesFinder < IssuableFinder
current_user.blank?
end
end
IssuesFinder.prepend_if_ee('EE::IssuesFinder')
Loading
Loading
@@ -13,6 +13,8 @@
class LicenseTemplateFinder
include Gitlab::Utils::StrongMemoize
 
prepend_if_ee('::EE::LicenseTemplateFinder') # rubocop: disable Cop/InjectEnterpriseEditionModule
attr_reader :project, :params
 
def initialize(project, params = {})
Loading
Loading
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