mirror of
https://github.com/opf/openproject.git
synced 2026-06-14 03:30:14 +00:00
Redefine rails application methods to use Rails.application
This commit is contained in:
@@ -32,7 +32,7 @@
|
||||
|
||||
require File.expand_path('config/application', __dir__)
|
||||
|
||||
OpenProject::Application.load_rake_tasks
|
||||
Rails.application.load_rake_tasks
|
||||
|
||||
Rake::Task[:default].clear
|
||||
task default: 'test:suite:run'
|
||||
|
||||
@@ -53,7 +53,7 @@ module RakeJob
|
||||
##
|
||||
# Load tasks if there are none. This should only be run once in an environment
|
||||
def load_tasks!
|
||||
OpenProject::Application.load_rake_tasks unless tasks_loaded?
|
||||
Rails.application.load_rake_tasks unless tasks_loaded?
|
||||
end
|
||||
|
||||
##
|
||||
|
||||
@@ -232,13 +232,13 @@ module OpenProject
|
||||
Settings::Definition.add_all
|
||||
end
|
||||
|
||||
def self.root_url
|
||||
def root_url
|
||||
"#{Setting.protocol}://#{Setting.host_name}"
|
||||
end
|
||||
|
||||
##
|
||||
# Load core and engine tasks we're interested in
|
||||
def self.load_rake_tasks
|
||||
def load_rake_tasks
|
||||
load_tasks
|
||||
Doorkeeper::Rake.load_tasks
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user