Merge branch 'sh-fix-gitlab-pages-refresh' into 'master'

Fix GitLab Pages not refreshing upon new content

Closes gitlab-com/infrastructure#1058

See merge request !1134

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)

spec/services/projects/update_pages_configuration_service_spec.rb

+require 'spec_helper'
+
+describe Projects::UpdatePagesConfigurationService, services: true do
+  let(:project) { create(:empty_project) }
+  subject { described_class.new(project) }
+
+  describe "#update" do
+    let(:file) { Tempfile.new('pages-test') }
+
+    after do
+      file.close
+      file.unlink
+    end
+
+    it 'updates the .update file' do
+      # Access this reference to ensure scoping works
+      Projects::Settings # rubocop:disable Lint/Void
+      expect(subject).to receive(:pages_config_file).and_return(file.path)
+      expect(subject).to receive(:reload_daemon).and_call_original
+
+      expect(subject.execute).to eq({ status: :success })
+    end
+  end
+end