Merge branch 'rename-gitlab-pages-shared-secret-file' into 'master'

Rename .gitlab_pages_shared_secret to .gitlab_pages_secret

See merge request gitlab-org/gitlab!20519

.gitignore

@@ -66,7 +66,7 @@ eslint-report.html
 /vendor/gitaly-ruby
 /builds*
 /.gitlab_workhorse_secret
-/.gitlab_pages_shared_secret
+/.gitlab_pages_secret
 /webpack-report/
 /knapsack/
 /rspec_flaky/

config/gitlab.yml.example

@@ -321,8 +321,8 @@ production: &base
     # external_https: ["1.1.1.1:443", "[2001::1]:443"] # If defined, enables custom domain and certificate support in GitLab Pages
 
     # File that contains the shared secret key for verifying access for gitlab-pages.
-    # Default is '.gitlab_pages_shared_secret' relative to Rails.root (i.e. root of the GitLab app).
-    # secret_file: /home/git/gitlab/.gitlab_pages_shared_secret
+    # Default is '.gitlab_pages_secret' relative to Rails.root (i.e. root of the GitLab app).
+    # secret_file: /home/git/gitlab/.gitlab_pages_secret
 
   ## Mattermost
   ## For enabling Add to Mattermost button

config/initializers/1_settings.rb

@@ -291,7 +291,7 @@ Settings.pages['url']               ||= Settings.__send__(:build_pages_url)
 Settings.pages['external_http']     ||= false unless Settings.pages['external_http'].present?
 Settings.pages['external_https']    ||= false unless Settings.pages['external_https'].present?
 Settings.pages['artifacts_server']  ||= Settings.pages['enabled'] if Settings.pages['artifacts_server'].nil?
-Settings.pages['secret_file'] ||= Rails.root.join('.gitlab_pages_shared_secret')
+Settings.pages['secret_file'] ||= Rails.root.join('.gitlab_pages_secret')
 
 #
 # Geo

spec/lib/gitlab/pages_spec.rb

@@ -3,10 +3,10 @@
 require 'spec_helper'
 
 describe Gitlab::Pages do
-  let(:pages_shared_secret) { SecureRandom.random_bytes(Gitlab::Pages::SECRET_LENGTH) }
+  let(:pages_secret) { SecureRandom.random_bytes(Gitlab::Pages::SECRET_LENGTH) }
 
   before do
-    allow(described_class).to receive(:secret).and_return(pages_shared_secret)
+    allow(described_class).to receive(:secret).and_return(pages_secret)
   end
 
   describe '.verify_api_request' do

spec/requests/api/internal/pages_spec.rb

@@ -4,10 +4,10 @@ require 'spec_helper'
 
 describe API::Internal::Pages do
   describe "GET /internal/pages" do
-    let(:pages_shared_secret) { SecureRandom.random_bytes(Gitlab::Pages::SECRET_LENGTH) }
+    let(:pages_secret) { SecureRandom.random_bytes(Gitlab::Pages::SECRET_LENGTH) }
 
     before do
-      allow(Gitlab::Pages).to receive(:secret).and_return(pages_shared_secret)
+      allow(Gitlab::Pages).to receive(:secret).and_return(pages_secret)
     end
 
     def query_host(host, headers = {})