diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-01-26 17:58:42 -0800 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-02-01 23:09:12 +0000 |
| commit | 239743345a23c53b2c41509cefb288450d3bb563 (patch) | |
| tree | 92d8869e3d783a7202e7599c74caed404e4ccb5e /app | |
| parent | 9677b5387201b2530b5cd18fe2b0bc897eae581e (diff) | |
| download | gitlab-ce-239743345a23c53b2c41509cefb288450d3bb563.tar.gz | |
Fix GitLab Pages not refreshing upon new content
Due to autoloading and Ruby scoping, the .update file was never being
updated due to this error:
```
NoMethodError: undefined method `pages' for Projects::Settings:Module
from /opt/gitlab/embedded/service/gitlab-rails/app/services/projects/update_pages_configuration_service.rb:50:in `pages_update_file'
from /opt/gitlab/embedded/service/gitlab-rails/lib/gitlab/metrics/instrumentation.rb:157:in `pages_update_file'
from (irb):6
from /opt/gitlab/embedded/lib/ruby/gems/2.3.0/gems/railties-4.2.7.1/lib/rails/commands/console.rb:110:in `start'
from /opt/gitlab/embedded/lib/ruby/gems/2.3.0/gems/railties-4.2.7.1/lib/rails/commands/console.rb:9:in `start'
from /opt/gitlab/embedded/lib/ruby/gems/2.3.0/gems/railties-4.2.7.1/lib/rails/commands/commands_tasks.rb:68:in `console'
from /opt/gitlab/embedded/lib/ruby/gems/2.3.0/gems/railties-4.2.7.1/lib/rails/commands/commands_tasks.rb:39:in `run_command!'
from /opt/gitlab/embedded/lib/ruby/gems/2.3.0/gems/railties-4.2.7.1/lib/rails/commands.rb:17:in `<top (required)>'
from bin/rails:9:in `require'
```
This error was caught and discarded quietly. This fix exercises this code and fixes the scope problem.
Closes gitlab-com/infrastructure#1058
Diffstat (limited to 'app')
| -rw-r--r-- | app/services/projects/update_pages_configuration_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/projects/update_pages_configuration_service.rb b/app/services/projects/update_pages_configuration_service.rb index 188847b5ad6..eb4809afa85 100644 --- a/app/services/projects/update_pages_configuration_service.rb +++ b/app/services/projects/update_pages_configuration_service.rb @@ -47,7 +47,7 @@ module Projects end def pages_update_file - File.join(Settings.pages.path, '.update') + File.join(::Settings.pages.path, '.update') end def update_file(file, data) |