Merge branch 'fix-gitlab-capitalization-code-ce' into 'master'

Correct Gitlab Capitalization in code files

See merge request gitlab-org/gitlab-ce!21841

.rubocop.yml

@@ -111,7 +111,7 @@ Naming/FileName:
     - XSRF
     - XSS
 
-# Gitlab ###################################################################
+# GitLab ###################################################################
 
 Gitlab/ModuleWithInstanceVariables:
   Enable: true

CHANGELOG.md

@@ -1126,7 +1126,7 @@ entry.
 - Use the default strings of timeago.js for timeago. !19350 (Takuya Noguchi)
 - Update selenium-webdriver to 3.12.0. !19351 (Takuya Noguchi)
 - Include username in output when testing SSH to GitLab. !19358
-- Update screenshot in Gitlab.com integration documentation. !19433 (Tuğçe Nur Taş)
+- Update screenshot in GitLab.com integration documentation. !19433 (Tuğçe Nur Taş)
 - Users can accept terms during registration. !19583
 - Fix issue count on sidebar.
 - Add merge requests list endpoint for groups.
@@ -1256,7 +1256,7 @@ entry.
 - Make toggle markdown preview shortcut only toggle selected field.
 - Verifiy if pipeline has commit idetails and render information in MR widget when branch is deleted.
 - Fixed inconsistent protected branch pill baseline.
-- Fix setting Gitlab metrics content types.
+- Fix setting GitLab metrics content types.
 - Display only generic message on merge error to avoid exposing any potentially sensitive or user unfriendly backend messages.
 - Fix label links update on project transfer.
 - Breaks commit not found message in pipelines table.
@@ -1626,7 +1626,7 @@ entry.
 - Add 'Assigned Issues' and 'Assigned Merge Requests' as dashboard view choices for users. !17860 (Elias Werberich)
 - Extend API for importing a project export with overwrite support. !17883
 - Create Deploy Tokens to allow permanent access to repository and registry. !17894
-- Detect commit message trailers and link users properly to their accounts on Gitlab. !17919 (cousine)
+- Detect commit message trailers and link users properly to their accounts on GitLab. !17919 (cousine)
 - Adds cancel btn to new pages domain page. !18026 (Jacopo Beschi @jacopo-beschi)
 - API: Add parameter merge_method to projects. !18031 (Jan Beckmann)
 - Introduce simpler env vars for auto devops REPLICAS and CANARY_REPLICAS #41436. !18036
@@ -3074,7 +3074,7 @@ entry.
 - [FIXED] Fix broken wiki pages that link to a wiki file. !15019
 - [FIXED] Don't rename paths that were freed up when upgrading. !15029
 - [FIXED] Fix bitbucket login. !15051
-- [FIXED] Update gitaly in Gitlab 10.1 to 0.43.1 for temp file cleanup. !15055
+- [FIXED] Update gitaly in GitLab 10.1 to 0.43.1 for temp file cleanup. !15055
 - [FIXED] Use the correct visibility attribute for projects in system hooks. !15065
 - [FIXED] Normalize LDAP DN when looking up identity.
 - [FIXED] Adds callback functions for initial request in clusters page.
@@ -4784,7 +4784,7 @@ entry.
 - Make user mentions case-insensitive. !10285 (blackst0ne)
 - Update rugged to 0.25.1.1. !10286 (Elan Ruusamäe)
 - Handle parsing OpenBSD ps output properly to display sidekiq infos on admin->monitoring->background. !10303 (Sebastian Reitenbach)
-- Log errors during generating of Gitlab Pages to debug log. !10335 (Danilo Bargen)
+- Log errors during generating of GitLab Pages to debug log. !10335 (Danilo Bargen)
 - Update issue board cards design. !10353
 - Tags can be protected, restricting creation of matching tags by user role. !10356
 - Set GIT_TERMINAL_PROMPT env variable in initializer. !10372
@@ -5197,7 +5197,7 @@ entry.
 - Restore keyboard shortcuts for "Activity" and "Charts". !9680
 - Added commit array to Syshook json. !9685 (Gabriele Pongelli)
 - Document ability to list issues with no labels using API. !9697 (Vignesh Ravichandran)
-- Fix typo in Gitlab config file. !9702 (medied)
+- Fix typo in GitLab config file. !9702 (medied)
 - Fix json response in branches controller. !9710 (George Andrinopoulos)
 - Refactor dropdown_assignee_spec. !9711 (George Andrinopoulos)
 - Delete artifacts for pages unless expiry date is specified. !9716

app/assets/javascripts/behaviors/markdown/render_gfm.js

@@ -3,7 +3,7 @@ import syntaxHighlight from '~/syntax_highlight';
 import renderMath from './render_math';
 import renderMermaid from './render_mermaid';
 
-// Render Gitlab flavoured Markdown
+// Render GitLab flavoured Markdown
 //
 // Delegates to syntax highlight and render math & mermaid diagrams.
 //

app/mailers/previews/notify_preview.rb

@@ -9,7 +9,7 @@ class NotifyPreview < ActionMailer::Preview
         In this notification email, we expect to see:
 
         - The note contents (that's what you're looking at)
-        - A link to view this note on Gitlab
+        - A link to view this note on GitLab
         - An explanation for why the user is receiving this notification
       MD
 
@@ -26,7 +26,7 @@ class NotifyPreview < ActionMailer::Preview
 
         - A line saying who started this discussion
         - The note contents (that's what you're looking at)
-        - A link to view this discussion on Gitlab
+        - A link to view this discussion on GitLab
         - An explanation for why the user is receiving this notification
       MD
 
@@ -44,7 +44,7 @@ class NotifyPreview < ActionMailer::Preview
         - A line saying who started this discussion and on what file
         - The diff
         - The note contents (that's what you're looking at)
-        - A link to view this discussion on Gitlab
+        - A link to view this discussion on GitLab
         - An explanation for why the user is receiving this notification
       MD
 

app/models/project_wiki.rb

@@ -80,7 +80,7 @@ class ProjectWiki
     pages(limit: 1).empty?
   end
 
-  # Returns an Array of Gitlab WikiPage instances or an
+  # Returns an Array of GitLab WikiPage instances or an
   # empty Array if this Wiki has no pages.
   def pages(limit: 0)
     wiki.pages(limit: limit).map { |page| WikiPage.new(self, page, true) }

app/models/wiki_page.rb

@@ -51,7 +51,7 @@ class WikiPage
   validates :title, presence: true
   validates :content, presence: true
 
-  # The Gitlab ProjectWiki instance.
+  # The GitLab ProjectWiki instance.
   attr_reader :wiki
 
   # The raw Gitlab::Git::WikiPage instance.
@@ -127,7 +127,7 @@ class WikiPage
     version.try(:message)
   end
 
-  # The Gitlab Commit instance for this page.
+  # The GitLab Commit instance for this page.
   def version
     return nil unless persisted?
 

app/views/help/instance_configuration/_gitlab_pages.html.haml

@@ -8,7 +8,7 @@
 
   %p
     Below are the settings for
-    = succeed('.') { link_to('Gitlab Pages', gitlab_pages[:url], target: '_blank') }
+    = succeed('.') { link_to('GitLab Pages', gitlab_pages[:url], target: '_blank') }
   .table-responsive
     %table
       %thead

bin/pkgr_before_precompile.sh

@@ -6,7 +6,7 @@ for file in config/*.yml.example; do
   cp ${file} config/$(basename ${file} .example)
 done
 
-# Allow to override the Gitlab URL from an environment variable, as this will avoid having to change the configuration file for simple deployments.
+# Allow to override the GitLab URL from an environment variable, as this will avoid having to change the configuration file for simple deployments.
 config=$(echo '<% gitlab_url = URI(ENV["GITLAB_URL"] || "http://localhost:80") %>' | cat - config/gitlab.yml)
 echo "$config" > config/gitlab.yml
 sed -i "s/host: localhost/host: <%= gitlab_url.host %>/" config/gitlab.yml

changelogs/archive.md

@@ -739,7 +739,7 @@
 - Update duration at the end of pipeline
 - ExpireBuildArtifactsWorker query builds table without ordering enqueuing one job per build to cleanup
 - Add group level labels. (!6425)
-- Add an example for testing a phoenix application with Gitlab CI in the docs (Manthan Mallikarjun)
+- Add an example for testing a phoenix application with GitLab CI in the docs (Manthan Mallikarjun)
 - Cancelled pipelines could be retried. !6927
 - Updating verbiage on git basics to be more intuitive
 - Fix project_feature record not generated on project creation
@@ -768,7 +768,7 @@
 - Log LDAP lookup errors and don't swallow unrelated exceptions. !6103 (Markus Koller)
 - Replace unique keyframes mixin with keyframe mixin with specific names (ClemMakesApps)
 - Add more tests for calendar contribution (ClemMakesApps)
-- Update Gitlab Shell to fix some problems with moving projects between storages
+- Update GitLab Shell to fix some problems with moving projects between storages
 - Cache rendered markdown in the database, rather than Redis
 - Add todo toggle event (ClemMakesApps)
 - Avoid database queries on Banzai::ReferenceParser::BaseParser for nodes without references
@@ -815,7 +815,7 @@
 - Replace static issue fixtures by script !6059 (winniehell)
 - Append issue template to existing description !6149 (Joseph Frazier)
 - Trending projects now only show public projects and the list of projects is cached for a day
-- Memoize Gitlab Shell's secret token (!6599, Justin DiPierro)
+- Memoize GitLab Shell's secret token (!6599, Justin DiPierro)
 - Revoke button in Applications Settings underlines on hover.
 - Use higher size on Gitlab::Redis connection pool on Sidekiq servers
 - Add missing values to linter !6276 (Katarzyna Kobierska Ula Budziszewska)
@@ -930,7 +930,7 @@
 
 ## 8.12.3
 
-  - Update Gitlab Shell to support low IO priority for storage moves
+  - Update GitLab Shell to support low IO priority for storage moves
 
 ## 8.12.2
 
@@ -1001,7 +1001,7 @@
   - Added ability to specify URL in environment configuration in gitlab-ci.yml
   - Escape search term before passing it to Regexp.new !6241 (winniehell)
   - Fix pinned sidebar behavior in smaller viewports !6169
-  - Fix file permissions change when updating a file on the Gitlab UI !5979
+  - Fix file permissions change when updating a file on the GitLab UI !5979
   - Added horizontal padding on build page sidebar on code coverage block. !6196 (Vitaly Baev)
   - Change merge_error column from string to text type
   - Fix issue with search filter labels not displaying
@@ -1688,7 +1688,7 @@
   - Fix commit avatar alignment in compare view. !5128
   - Fix broken migration in MySQL. !5005
   - Overwrite Host and X-Forwarded-Host headers in NGINX !5213
-  - Keeps issue number when importing from Gitlab.com
+  - Keeps issue number when importing from GitLab.com
   - Add Pending tab for Builds (Katarzyna Kobierska, Urszula Budziszewska)
 
 ## 8.9.5
@@ -4786,7 +4786,7 @@
 ## 3.1.0
 
 - Updated gems
-- Services: Gitlab CI integration
+- Services: GitLab CI integration
 - Events filter on dashboard
 - Own namespace for redis/resque
 - Optimized commit diff views
@@ -4869,7 +4869,7 @@
 
 ## 2.8.0
 
-- Gitlab Flavored Markdown
+- GitLab Flavored Markdown
 - Bulk issues update
 - Issues API
 - Cucumber coverage increased

config/application.rb

@@ -205,7 +205,7 @@ module Gitlab
     ENV['GITLAB_PATH_OUTSIDE_HOOK'] = ENV['PATH']
     ENV['GIT_TERMINAL_PROMPT'] = '0'
 
-    # Gitlab Read-only middleware support
+    # GitLab Read-only middleware support
     config.middleware.insert_after ActionDispatch::Flash, ::Gitlab::Middleware::ReadOnly
 
     config.generators do |g|

lib/gitlab/auth/ldap/access.rb

@@ -92,12 +92,12 @@ module Gitlab
           if provider
             Gitlab::AppLogger.info(
               "LDAP account \"#{ldap_identity.extern_uid}\" #{reason}, " \
-              "blocking Gitlab user \"#{user.name}\" (#{user.email})"
+              "blocking GitLab user \"#{user.name}\" (#{user.email})"
             )
           else
             Gitlab::AppLogger.info(
               "Account is not provided by LDAP, " \
-              "blocking Gitlab user \"#{user.name}\" (#{user.email})"
+              "blocking GitLab user \"#{user.name}\" (#{user.email})"
             )
           end
         end
@@ -107,7 +107,7 @@ module Gitlab
 
           Gitlab::AppLogger.info(
             "LDAP account \"#{ldap_identity.extern_uid}\" #{reason}, " \
-            "unblocking Gitlab user \"#{user.name}\" (#{user.email})"
+            "unblocking GitLab user \"#{user.name}\" (#{user.email})"
           )
         end
       end

lib/gitlab/gitaly_client/storage_settings.rb

@@ -13,7 +13,7 @@ module Gitlab
         Storage is invalid because it has no `path` key.
 
         For source installations, update your config/gitlab.yml Refer to gitlab.yml.example for an updated example.
-        If you're using the Gitlab Development Kit, you can update your configuration running `gdk reconfigure`.
+        If you're using the GitLab Development Kit, you can update your configuration running `gdk reconfigure`.
       MSG
 
       # This class will give easily recognizable NoMethodErrors

lib/gitlab/template/finders/global_template_finder.rb

@@ -1,4 +1,4 @@
-# Searches and reads file present on Gitlab installation directory
+# Searches and reads file present on GitLab installation directory
 module Gitlab
   module Template
     module Finders

lib/gitlab/template/finders/repo_template_finder.rb

@@ -1,4 +1,4 @@
-# Searches and reads files present on each Gitlab project repository
+# Searches and reads files present on each GitLab project repository
 module Gitlab
   module Template
     module Finders

lib/support/nginx/gitlab

@@ -17,7 +17,7 @@
 ## See installation.md#using-https for additional HTTPS configuration details.
 
 upstream gitlab-workhorse {
-  # Gitlab socket file,
+  # GitLab socket file,
   # for Omnibus this would be: unix:/var/opt/gitlab/gitlab-workhorse/socket
   server unix:/home/git/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
 }
@@ -112,7 +112,7 @@ server {
   error_page 502 /502.html;
   error_page 503 /503.html;
   location ~ ^/(404|422|500|502|503)\.html$ {
-    # Location to the Gitlab's public directory,
+    # Location to the GitLab's public directory,
     # for Omnibus this would be: /opt/gitlab/embedded/service/gitlab-rails/public.
     root /home/git/gitlab/public;
     internal;

lib/support/nginx/gitlab-ssl

@@ -21,7 +21,7 @@
 ## See installation.md#using-https for additional HTTPS configuration details.
 
 upstream gitlab-workhorse {
-  # Gitlab socket file,
+  # GitLab socket file,
   # for Omnibus this would be: unix:/var/opt/gitlab/gitlab-workhorse/socket
   server unix:/home/git/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
 }
@@ -162,7 +162,7 @@ server {
   error_page 502 /502.html;
   error_page 503 /503.html;
   location ~ ^/(404|422|500|502|503)\.html$ {
-    # Location to the Gitlab's public directory,
+    # Location to the GitLab's public directory,
     # for Omnibus this would be: /opt/gitlab/embedded/service/gitlab-rails/public
     root /home/git/gitlab/public;
     internal;

spec/lib/gitlab/auth/ldap/access_spec.rb

@@ -48,7 +48,7 @@ describe Gitlab::Auth::LDAP::Access do
       it 'logs the reason' do
         expect(Gitlab::AppLogger).to receive(:info).with(
           "LDAP account \"123456\" does not exist anymore, " \
-          "blocking Gitlab user \"#{user.name}\" (#{user.email})"
+          "blocking GitLab user \"#{user.name}\" (#{user.email})"
         )
 
         access.allowed?
@@ -79,7 +79,7 @@ describe Gitlab::Auth::LDAP::Access do
         it 'logs the reason' do
           expect(Gitlab::AppLogger).to receive(:info).with(
             "LDAP account \"123456\" is disabled in Active Directory, " \
-            "blocking Gitlab user \"#{user.name}\" (#{user.email})"
+            "blocking GitLab user \"#{user.name}\" (#{user.email})"
           )
 
           access.allowed?
@@ -123,7 +123,7 @@ describe Gitlab::Auth::LDAP::Access do
           it 'logs the reason' do
             expect(Gitlab::AppLogger).to receive(:info).with(
               "LDAP account \"123456\" is not disabled anymore, " \
-              "unblocking Gitlab user \"#{user.name}\" (#{user.email})"
+              "unblocking GitLab user \"#{user.name}\" (#{user.email})"
             )
 
             access.allowed?
@@ -161,7 +161,7 @@ describe Gitlab::Auth::LDAP::Access do
           it 'logs the reason' do
             expect(Gitlab::AppLogger).to receive(:info).with(
               "LDAP account \"123456\" does not exist anymore, " \
-              "blocking Gitlab user \"#{user.name}\" (#{user.email})"
+              "blocking GitLab user \"#{user.name}\" (#{user.email})"
             )
 
             access.allowed?
@@ -183,7 +183,7 @@ describe Gitlab::Auth::LDAP::Access do
           it 'logs the reason' do
             expect(Gitlab::AppLogger).to receive(:info).with(
               "LDAP account \"123456\" is available again, " \
-              "unblocking Gitlab user \"#{user.name}\" (#{user.email})"
+              "unblocking GitLab user \"#{user.name}\" (#{user.email})"
             )
 
             access.allowed?

spec/lib/gitlab/middleware/read_only_spec.rb

@@ -34,7 +34,7 @@ describe Gitlab::Middleware::ReadOnly do
     end
   end
 
-  context 'normal requests to a read-only Gitlab instance' do
+  context 'normal requests to a read-only GitLab instance' do
     let(:fake_app) { lambda { |env| [200, { 'Content-Type' => 'text/plain' }, ['OK']] } }
 
     before do

spec/models/instance_configuration_spec.rb

@@ -52,7 +52,7 @@ RSpec.describe InstanceConfiguration do
           expect(gitlab_pages).to eq(Settings.pages.symbolize_keys)
         end
 
-        it 'returns the Gitlab\'s pages host ip address' do
+        it 'returns the GitLab\'s pages host ip address' do
           expect(gitlab_pages.keys).to include(:ip_address)
         end
 

spec/requests/openid_connect_spec.rb

@@ -121,7 +121,7 @@ describe 'OpenID Connect requests' do
         expect(@payload).to match(a_hash_including(id_token_claims))
       end
 
-      it 'includes the Gitlab root URL' do
+      it 'includes the GitLab root URL' do
         expect(@payload['iss']).to eq Gitlab.config.gitlab.url
       end
 

spec/services/auth/container_registry_authentication_service_spec.rb

@@ -145,7 +145,7 @@ describe Auth::ContainerRegistryAuthenticationService do
         { scopes: ["registry:catalog:*"] }
       end
 
-      context 'disallow browsing for users without Gitlab admin rights' do
+      context 'disallow browsing for users without GitLab admin rights' do
         it_behaves_like 'an inaccessible'
         it_behaves_like 'not a container repository factory'
       end

spec/services/groups/transfer_service_spec.rb

@@ -22,7 +22,7 @@ describe Groups::TransferService, :postgresql do
       end
     end
 
-    context "when there's an exception on Gitlab shell directories" do
+    context "when there's an exception on GitLab shell directories" do
       let(:new_parent_group) { create(:group, :public) }
 
       before do