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
@@ -83,5 +83,3 @@ module Boards
end
end
end
Boards::ListsController.prepend(EE::Boards::ListsController)
Loading
Loading
@@ -234,5 +234,3 @@ class Clusters::ClustersController < Clusters::BaseController
@cluster.applications.each(&:schedule_status_update)
end
end
Clusters::ClustersController.prepend(EE::Clusters::ClustersController)
Loading
Loading
@@ -44,5 +44,3 @@ module BoardsActions
serializer.represent(resource, serializer: 'board', include_full_project_path: board.group_board?)
end
end
BoardsActions.prepend(EE::BoardsActions)
Loading
Loading
@@ -85,5 +85,3 @@ module BoardsResponses
BoardSerializer.new
end
end
BoardsResponses.prepend(EE::BoardsResponses)
Loading
Loading
@@ -45,5 +45,3 @@ module InternalRedirect
URI(request.referer).path
end
end
InternalRedirect.prepend(EE::InternalRedirect)
Loading
Loading
@@ -223,5 +223,3 @@ module IssuableActions
@project || @group # rubocop:disable Gitlab/ModuleWithInstanceVariables
end
end
IssuableActions.prepend(EE::IssuableActions)
Loading
Loading
@@ -208,5 +208,3 @@ module IssuableCollections
end
# rubocop:enable Gitlab/ModuleWithInstanceVariables
end
IssuableCollections.prepend(EE::IssuableCollections)
Loading
Loading
@@ -128,5 +128,3 @@ module LfsRequest
false
end
end
LfsRequest.prepend(EE::LfsRequest)
Loading
Loading
@@ -55,5 +55,3 @@ module RoutableActions
end
end
end
RoutableActions.prepend(EE::RoutableActions)
Loading
Loading
@@ -85,5 +85,3 @@ module ServiceParams
ALLOWED_PARAMS_CE
end
end
ServiceParams.prepend(EE::ServiceParams)
Loading
Loading
@@ -31,5 +31,3 @@ class ConfirmationsController < Devise::ConfirmationsController
after_sign_in_path_for(resource)
end
end
ConfirmationsController.prepend(EE::ConfirmationsController)
Loading
Loading
@@ -88,5 +88,3 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
Events::RenderService.new(current_user).execute(@events, atom_request: request.format.atom?)
end
end
Dashboard::ProjectsController.prepend(EE::Dashboard::ProjectsController)
Loading
Loading
@@ -38,5 +38,3 @@ class Groups::ApplicationController < ApplicationController
url_for(safe_params)
end
end
Groups::ApplicationController.prepend(EE::Groups::ApplicationController)
Loading
Loading
@@ -44,5 +44,3 @@ class Groups::GroupMembersController < Groups::ApplicationController
# MembershipActions concern
alias_method :membershipable, :group
end
Groups::GroupMembersController.prepend(EE::Groups::GroupMembersController)
Loading
Loading
@@ -118,5 +118,3 @@ class Groups::MilestonesController < Groups::ApplicationController
params.permit(:state, :search_title).merge(group_ids: group.id)
end
end
Groups::MilestonesController.prepend(EE::Groups::MilestonesController)
Loading
Loading
@@ -228,5 +228,3 @@ class GroupsController < Groups::ApplicationController
url_for(safe_params)
end
end
GroupsController.prepend(EE::GroupsController)
Loading
Loading
@@ -6,5 +6,3 @@ class IdeController < ApplicationController
def index
end
end
IdeController.prepend(EE::IdeController)
Loading
Loading
@@ -182,5 +182,3 @@ class Import::GithubController < Import::BaseController
{}
end
end
Import::GithubController.prepend(EE::Import::GithubController)
Loading
Loading
@@ -31,5 +31,3 @@ class Ldap::OmniauthCallbacksController < OmniauthCallbacksController
redirect_to new_user_session_path
end
end
Ldap::OmniauthCallbacksController.prepend(EE::Ldap::OmniauthCallbacksController)
Loading
Loading
@@ -214,5 +214,3 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
end
end
end
OmniauthCallbacksController.prepend(EE::OmniauthCallbacksController)
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