aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/tasks
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2016-01-31 20:53:50 +0100
committerKasper Timm Hansen <kaspth@gmail.com>2016-01-31 20:53:50 +0100
commit81052c8cd908a0626a7ef77bb5c3dc89898b3626 (patch)
tree2314e5ecfd46a4f7c3ffa5e7390efba48ec9fe2f /railties/lib/rails/tasks
parent662889cf3621a9d536ec4a7e876c510b0ac3f946 (diff)
parent3ffa5a15cc966c80029043c77adb3184422e33b3 (diff)
downloadrails-81052c8cd908a0626a7ef77bb5c3dc89898b3626.tar.gz
rails-81052c8cd908a0626a7ef77bb5c3dc89898b3626.tar.bz2
rails-81052c8cd908a0626a7ef77bb5c3dc89898b3626.zip
Merge pull request #23169 from y-yagi/rake_proxy_in_engine
make rake proxy work in rails engines
Diffstat (limited to 'railties/lib/rails/tasks')
-rw-r--r--railties/lib/rails/tasks/engine.rake4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/tasks/engine.rake b/railties/lib/rails/tasks/engine.rake
index c51524f8f6..e678103f63 100644
--- a/railties/lib/rails/tasks/engine.rake
+++ b/railties/lib/rails/tasks/engine.rake
@@ -4,8 +4,8 @@ task "load_app" do
end
task :environment => "app:environment"
- if !defined?(ENGINE_PATH) || !ENGINE_PATH
- ENGINE_PATH = find_engine_path(APP_RAKEFILE)
+ if !defined?(ENGINE_ROOT) || !ENGINE_ROOT
+ ENGINE_ROOT = find_engine_path(APP_RAKEFILE)
end
end