Commit 86fd8034 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Move EE-specific files to a standalone directory

parent 3fc92c79
# Shorter routing method for some project items
module GitlabRoutingHelper
include EE::GitlabRoutingHelper
extend ActiveSupport::Concern
included do
......
module IssuesHelper
include EE::IssuesHelper
def issue_css_classes(issue)
classes = "issue"
classes << " closed" if issue.closed?
......
module NamespacesHelper
include EE::NamespaceHelper
def namespace_id_from(params)
params.dig(:project, :namespace_id) || params[:namespace_id]
end
......
......@@ -37,7 +37,16 @@ module Gitlab
config.generators.templates.push("#{config.root}/generator_templates")
# EE specific paths.
config.eager_load_paths.push("#{config.root}/app/workers/concerns")
config.eager_load_paths.push(*%W[
#{config.root}/ee/app/controllers
#{config.root}/ee/app/helpers
#{config.root}/ee/app/mailers
#{config.root}/ee/app/models
#{config.root}/ee/app/models/concerns
#{config.root}/ee/app/policies
#{config.root}/ee/app/services
#{config.root}/ee/app/workers
])
# Only load the plugins named here, in the order given (default is alphabetical).
# :all can be used as a placeholder for all plugins not explicitly named.
......
require_dependency Rails.root.join('lib/gitlab') # Load Gitlab as soon as possible
require_dependency Rails.root.join('lib/ee') # Load EE as soon as possible
class Settings < Settingslogic
source ENV.fetch('GITLAB_CONFIG') { "#{Rails.root}/config/gitlab.yml" }
......
......@@ -2,6 +2,8 @@ class Admin::GeoNodesController < Admin::ApplicationController
before_action :check_license, except: [:index, :destroy]
before_action :load_node, only: [:edit, :update, :destroy, :repair, :toggle, :status]
helper EE::GeoHelper
def index
@nodes = GeoNode.all.order(:id)
@node = GeoNode.new
......
# Define the EE module
module EE
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment