lib/katello.rb in katello-1.5.0 vs lib/katello.rb in katello-2.2.2
- old
+ new
@@ -3,44 +3,41 @@
require "apipie-rails"
require "rabl"
require "tire"
require "oauth"
-require "openid"
require "gettext_i18n_rails"
require "i18n_data"
require "hooks"
require "foreigner"
-require "dynflow"
+require "foreman-tasks"
require "rest_client"
-require "i18n_data"
require "justified/standard_error"
require "anemone"
+require "securerandom"
+require 'foreman_docker'
require "runcible"
-require "simple_navigation"
require "haml-rails"
-require "compass-rails"
-require "ninesixty"
-require "ui_alchemy-rails"
require "deface"
+require 'jquery-ui-rails'
+require 'qpid_messaging'
-require "uuidtools"
-require "delayed_job"
+require "securerandom"
-require File.expand_path("../engines/bastion/lib/bastion", File.dirname(__FILE__))
-require "headpin/headpin"
+# to make Foreman#in_rake? helper available if Foreman's lib is available
+lib_foreman = File.expand_path('lib/foreman', Rails.root)
+require lib_foreman if Dir.exist?(lib_foreman)
+
+require File.expand_path("../engines/bastion_katello/lib/bastion_katello", File.dirname(__FILE__))
require "monkeys/string_to_bool"
+require "monkeys/anemone"
-# ENGINE: Re-enable after fixing migrations in Katello proper
-#require File.expand_path("../engines/fort/lib/fort", File.dirname(__FILE__))
-
module Katello
-
+ require "katello/version"
require "katello/app_config"
require "katello/engine"
require "katello/load_configuration"
require "katello/logging"
- require "katello/actions/actions"
-
+ require 'katello/middleware/silenced_logger.rb'
end