summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2017-01-10 15:46:47 +0000
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-02-01 23:36:37 +0000
commit7cacaf18de37987f15a3c41d1d022621c810d699 (patch)
treedaa21014a254595ec2e3ec112207799d4b045f3a
parent239743345a23c53b2c41509cefb288450d3bb563 (diff)
downloadgitlab-ce-7cacaf18de37987f15a3c41d1d022621c810d699.tar.gz
Fix constant resolution in UpdatePagesService
There is now a `Projects::Settings` module, for the members controller. Ensure that we get the actual settings, not that module.
-rw-r--r--app/services/projects/update_pages_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/projects/update_pages_service.rb b/app/services/projects/update_pages_service.rb
index c52f3d3e230..f5f9ee88912 100644
--- a/app/services/projects/update_pages_service.rb
+++ b/app/services/projects/update_pages_service.rb
@@ -130,7 +130,7 @@ module Projects
end
def tmp_path
- @tmp_path ||= File.join(Settings.pages.path, 'tmp')
+ @tmp_path ||= File.join(::Settings.pages.path, 'tmp')
end
def pages_path