Commit f9320089 authored by Douwe Maan's avatar Douwe Maan

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

Correct Gitlab Capitalization in code files

See merge request gitlab-org/gitlab-ce!21841
parents abab0cd6 eb640ede
...@@ -111,7 +111,7 @@ Naming/FileName: ...@@ -111,7 +111,7 @@ Naming/FileName:
- XSRF - XSRF
- XSS - XSS
# Gitlab ################################################################### # GitLab ###################################################################
Gitlab/ModuleWithInstanceVariables: Gitlab/ModuleWithInstanceVariables:
Enable: true Enable: true
......
...@@ -1126,7 +1126,7 @@ entry. ...@@ -1126,7 +1126,7 @@ entry.
- Use the default strings of timeago.js for timeago. !19350 (Takuya Noguchi) - Use the default strings of timeago.js for timeago. !19350 (Takuya Noguchi)
- Update selenium-webdriver to 3.12.0. !19351 (Takuya Noguchi) - Update selenium-webdriver to 3.12.0. !19351 (Takuya Noguchi)
- Include username in output when testing SSH to GitLab. !19358 - 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 - Users can accept terms during registration. !19583
- Fix issue count on sidebar. - Fix issue count on sidebar.
- Add merge requests list endpoint for groups. - Add merge requests list endpoint for groups.
...@@ -1256,7 +1256,7 @@ entry. ...@@ -1256,7 +1256,7 @@ entry.
- Make toggle markdown preview shortcut only toggle selected field. - 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. - Verifiy if pipeline has commit idetails and render information in MR widget when branch is deleted.
- Fixed inconsistent protected branch pill baseline. - 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. - 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. - Fix label links update on project transfer.
- Breaks commit not found message in pipelines table. - Breaks commit not found message in pipelines table.
...@@ -1626,7 +1626,7 @@ entry. ...@@ -1626,7 +1626,7 @@ entry.
- Add 'Assigned Issues' and 'Assigned Merge Requests' as dashboard view choices for users. !17860 (Elias Werberich) - 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 - Extend API for importing a project export with overwrite support. !17883
- Create Deploy Tokens to allow permanent access to repository and registry. !17894 - 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) - Adds cancel btn to new pages domain page. !18026 (Jacopo Beschi @jacopo-beschi)
- API: Add parameter merge_method to projects. !18031 (Jan Beckmann) - API: Add parameter merge_method to projects. !18031 (Jan Beckmann)
- Introduce simpler env vars for auto devops REPLICAS and CANARY_REPLICAS #41436. !18036 - Introduce simpler env vars for auto devops REPLICAS and CANARY_REPLICAS #41436. !18036
...@@ -3074,7 +3074,7 @@ entry. ...@@ -3074,7 +3074,7 @@ entry.
- [FIXED] Fix broken wiki pages that link to a wiki file. !15019 - [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] Don't rename paths that were freed up when upgrading. !15029
- [FIXED] Fix bitbucket login. !15051 - [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] Use the correct visibility attribute for projects in system hooks. !15065
- [FIXED] Normalize LDAP DN when looking up identity. - [FIXED] Normalize LDAP DN when looking up identity.
- [FIXED] Adds callback functions for initial request in clusters page. - [FIXED] Adds callback functions for initial request in clusters page.
...@@ -4784,7 +4784,7 @@ entry. ...@@ -4784,7 +4784,7 @@ entry.
- Make user mentions case-insensitive. !10285 (blackst0ne) - Make user mentions case-insensitive. !10285 (blackst0ne)
- Update rugged to 0.25.1.1. !10286 (Elan Ruusamäe) - 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) - 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 - Update issue board cards design. !10353
- Tags can be protected, restricting creation of matching tags by user role. !10356 - Tags can be protected, restricting creation of matching tags by user role. !10356
- Set GIT_TERMINAL_PROMPT env variable in initializer. !10372 - Set GIT_TERMINAL_PROMPT env variable in initializer. !10372
...@@ -5197,7 +5197,7 @@ entry. ...@@ -5197,7 +5197,7 @@ entry.
- Restore keyboard shortcuts for "Activity" and "Charts". !9680 - Restore keyboard shortcuts for "Activity" and "Charts". !9680
- Added commit array to Syshook json. !9685 (Gabriele Pongelli) - Added commit array to Syshook json. !9685 (Gabriele Pongelli)
- Document ability to list issues with no labels using API. !9697 (Vignesh Ravichandran) - 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) - Fix json response in branches controller. !9710 (George Andrinopoulos)
- Refactor dropdown_assignee_spec. !9711 (George Andrinopoulos) - Refactor dropdown_assignee_spec. !9711 (George Andrinopoulos)
- Delete artifacts for pages unless expiry date is specified. !9716 - Delete artifacts for pages unless expiry date is specified. !9716
......
...@@ -3,7 +3,7 @@ import syntaxHighlight from '~/syntax_highlight'; ...@@ -3,7 +3,7 @@ import syntaxHighlight from '~/syntax_highlight';
import renderMath from './render_math'; import renderMath from './render_math';
import renderMermaid from './render_mermaid'; import renderMermaid from './render_mermaid';
// Render Gitlab flavoured Markdown // Render GitLab flavoured Markdown
// //
// Delegates to syntax highlight and render math & mermaid diagrams. // Delegates to syntax highlight and render math & mermaid diagrams.
// //
......
...@@ -9,7 +9,7 @@ class NotifyPreview < ActionMailer::Preview ...@@ -9,7 +9,7 @@ class NotifyPreview < ActionMailer::Preview
In this notification email, we expect to see: In this notification email, we expect to see:
- The note contents (that's what you're looking at) - 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 - An explanation for why the user is receiving this notification
MD MD
...@@ -26,7 +26,7 @@ class NotifyPreview < ActionMailer::Preview ...@@ -26,7 +26,7 @@ class NotifyPreview < ActionMailer::Preview
- A line saying who started this discussion - A line saying who started this discussion
- The note contents (that's what you're looking at) - 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 - An explanation for why the user is receiving this notification
MD MD
...@@ -44,7 +44,7 @@ class NotifyPreview < ActionMailer::Preview ...@@ -44,7 +44,7 @@ class NotifyPreview < ActionMailer::Preview
- A line saying who started this discussion and on what file - A line saying who started this discussion and on what file
- The diff - The diff
- The note contents (that's what you're looking at) - 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 - An explanation for why the user is receiving this notification
MD MD
......
...@@ -80,7 +80,7 @@ class ProjectWiki ...@@ -80,7 +80,7 @@ class ProjectWiki
pages(limit: 1).empty? pages(limit: 1).empty?
end 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. # empty Array if this Wiki has no pages.
def pages(limit: 0) def pages(limit: 0)
wiki.pages(limit: limit).map { |page| WikiPage.new(self, page, true) } wiki.pages(limit: limit).map { |page| WikiPage.new(self, page, true) }
......
...@@ -51,7 +51,7 @@ class WikiPage ...@@ -51,7 +51,7 @@ class WikiPage
validates :title, presence: true validates :title, presence: true
validates :content, presence: true validates :content, presence: true
# The Gitlab ProjectWiki instance. # The GitLab ProjectWiki instance.
attr_reader :wiki attr_reader :wiki
# The raw Gitlab::Git::WikiPage instance. # The raw Gitlab::Git::WikiPage instance.
...@@ -127,7 +127,7 @@ class WikiPage ...@@ -127,7 +127,7 @@ class WikiPage
version.try(:message) version.try(:message)
end end
# The Gitlab Commit instance for this page. # The GitLab Commit instance for this page.
def version def version
return nil unless persisted? return nil unless persisted?
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
%p %p
Below are the settings for 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-responsive
%table %table
%thead %thead
......
...@@ -6,7 +6,7 @@ for file in config/*.yml.example; do ...@@ -6,7 +6,7 @@ for file in config/*.yml.example; do
cp ${file} config/$(basename ${file} .example) cp ${file} config/$(basename ${file} .example)
done 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) config=$(echo '<% gitlab_url = URI(ENV["GITLAB_URL"] || "http://localhost:80") %>' | cat - config/gitlab.yml)
echo "$config" > config/gitlab.yml echo "$config" > config/gitlab.yml
sed -i "s/host: localhost/host: <%= gitlab_url.host %>/" config/gitlab.yml sed -i "s/host: localhost/host: <%= gitlab_url.host %>/" config/gitlab.yml
......
...@@ -739,7 +739,7 @@ ...@@ -739,7 +739,7 @@
- Update duration at the end of pipeline - Update duration at the end of pipeline
- ExpireBuildArtifactsWorker query builds table without ordering enqueuing one job per build to cleanup - ExpireBuildArtifactsWorker query builds table without ordering enqueuing one job per build to cleanup
- Add group level labels. (!6425) - 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 - Cancelled pipelines could be retried. !6927
- Updating verbiage on git basics to be more intuitive - Updating verbiage on git basics to be more intuitive
- Fix project_feature record not generated on project creation - Fix project_feature record not generated on project creation
...@@ -768,7 +768,7 @@ ...@@ -768,7 +768,7 @@
- Log LDAP lookup errors and don't swallow unrelated exceptions. !6103 (Markus Koller) - Log LDAP lookup errors and don't swallow unrelated exceptions. !6103 (Markus Koller)
- Replace unique keyframes mixin with keyframe mixin with specific names (ClemMakesApps) - Replace unique keyframes mixin with keyframe mixin with specific names (ClemMakesApps)
- Add more tests for calendar contribution (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 - Cache rendered markdown in the database, rather than Redis
- Add todo toggle event (ClemMakesApps) - Add todo toggle event (ClemMakesApps)
- Avoid database queries on Banzai::ReferenceParser::BaseParser for nodes without references - Avoid database queries on Banzai::ReferenceParser::BaseParser for nodes without references
...@@ -815,7 +815,7 @@ ...@@ -815,7 +815,7 @@
- Replace static issue fixtures by script !6059 (winniehell) - Replace static issue fixtures by script !6059 (winniehell)
- Append issue template to existing description !6149 (Joseph Frazier) - 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 - 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. - Revoke button in Applications Settings underlines on hover.
- Use higher size on Gitlab::Redis connection pool on Sidekiq servers - Use higher size on Gitlab::Redis connection pool on Sidekiq servers
- Add missing values to linter !6276 (Katarzyna Kobierska Ula Budziszewska) - Add missing values to linter !6276 (Katarzyna Kobierska Ula Budziszewska)
...@@ -930,7 +930,7 @@ ...@@ -930,7 +930,7 @@
## 8.12.3 ## 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 ## 8.12.2
...@@ -1001,7 +1001,7 @@ ...@@ -1001,7 +1001,7 @@
- Added ability to specify URL in environment configuration in gitlab-ci.yml - Added ability to specify URL in environment configuration in gitlab-ci.yml
- Escape search term before passing it to Regexp.new !6241 (winniehell) - Escape search term before passing it to Regexp.new !6241 (winniehell)
- Fix pinned sidebar behavior in smaller viewports !6169 - 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) - Added horizontal padding on build page sidebar on code coverage block. !6196 (Vitaly Baev)
- Change merge_error column from string to text type - Change merge_error column from string to text type
- Fix issue with search filter labels not displaying - Fix issue with search filter labels not displaying
...@@ -1688,7 +1688,7 @@ ...@@ -1688,7 +1688,7 @@
- Fix commit avatar alignment in compare view. !5128 - Fix commit avatar alignment in compare view. !5128
- Fix broken migration in MySQL. !5005 - Fix broken migration in MySQL. !5005
- Overwrite Host and X-Forwarded-Host headers in NGINX !5213 - 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) - Add Pending tab for Builds (Katarzyna Kobierska, Urszula Budziszewska)
## 8.9.5 ## 8.9.5
...@@ -4786,7 +4786,7 @@ ...@@ -4786,7 +4786,7 @@
## 3.1.0 ## 3.1.0
- Updated gems - Updated gems
- Services: Gitlab CI integration - Services: GitLab CI integration
- Events filter on dashboard - Events filter on dashboard
- Own namespace for redis/resque - Own namespace for redis/resque
- Optimized commit diff views - Optimized commit diff views
...@@ -4869,7 +4869,7 @@ ...@@ -4869,7 +4869,7 @@
## 2.8.0 ## 2.8.0
- Gitlab Flavored Markdown - GitLab Flavored Markdown
- Bulk issues update - Bulk issues update
- Issues API - Issues API
- Cucumber coverage increased - Cucumber coverage increased
......
...@@ -205,7 +205,7 @@ module Gitlab ...@@ -205,7 +205,7 @@ module Gitlab
ENV['GITLAB_PATH_OUTSIDE_HOOK'] = ENV['PATH'] ENV['GITLAB_PATH_OUTSIDE_HOOK'] = ENV['PATH']
ENV['GIT_TERMINAL_PROMPT'] = '0' 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.middleware.insert_after ActionDispatch::Flash, ::Gitlab::Middleware::ReadOnly
config.generators do |g| config.generators do |g|
......
...@@ -92,12 +92,12 @@ module Gitlab ...@@ -92,12 +92,12 @@ module Gitlab
if provider if provider
Gitlab::AppLogger.info( Gitlab::AppLogger.info(
"LDAP account \"#{ldap_identity.extern_uid}\" #{reason}, " \ "LDAP account \"#{ldap_identity.extern_uid}\" #{reason}, " \
"blocking Gitlab user \"#{user.name}\" (#{user.email})" "blocking GitLab user \"#{user.name}\" (#{user.email})"
) )
else else
Gitlab::AppLogger.info( Gitlab::AppLogger.info(
"Account is not provided by LDAP, " \ "Account is not provided by LDAP, " \
"blocking Gitlab user \"#{user.name}\" (#{user.email})" "blocking GitLab user \"#{user.name}\" (#{user.email})"
) )
end end
end end
...@@ -107,7 +107,7 @@ module Gitlab ...@@ -107,7 +107,7 @@ module Gitlab
Gitlab::AppLogger.info( Gitlab::AppLogger.info(
"LDAP account \"#{ldap_identity.extern_uid}\" #{reason}, " \ "LDAP account \"#{ldap_identity.extern_uid}\" #{reason}, " \
"unblocking Gitlab user \"#{user.name}\" (#{user.email})" "unblocking GitLab user \"#{user.name}\" (#{user.email})"
) )
end end
end end
......
...@@ -13,7 +13,7 @@ module Gitlab ...@@ -13,7 +13,7 @@ module Gitlab
Storage is invalid because it has no `path` key. 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. 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 MSG
# This class will give easily recognizable NoMethodErrors # This class will give easily recognizable NoMethodErrors
......
# Searches and reads file present on Gitlab installation directory # Searches and reads file present on GitLab installation directory
module Gitlab module Gitlab
module Template module Template
module Finders module Finders
......
# Searches and reads files present on each Gitlab project repository # Searches and reads files present on each GitLab project repository
module Gitlab module Gitlab
module Template module Template
module Finders module Finders
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
## See installation.md#using-https for additional HTTPS configuration details. ## See installation.md#using-https for additional HTTPS configuration details.
upstream gitlab-workhorse { upstream gitlab-workhorse {
# Gitlab socket file, # GitLab socket file,
# for Omnibus this would be: unix:/var/opt/gitlab/gitlab-workhorse/socket # 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; server unix:/home/git/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
} }
...@@ -112,7 +112,7 @@ server { ...@@ -112,7 +112,7 @@ server {
error_page 502 /502.html; error_page 502 /502.html;
error_page 503 /503.html; error_page 503 /503.html;
location ~ ^/(404|422|500|502|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. # for Omnibus this would be: /opt/gitlab/embedded/service/gitlab-rails/public.
root /home/git/gitlab/public; root /home/git/gitlab/public;
internal; internal;
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
## See installation.md#using-https for additional HTTPS configuration details. ## See installation.md#using-https for additional HTTPS configuration details.
upstream gitlab-workhorse { upstream gitlab-workhorse {
# Gitlab socket file, # GitLab socket file,
# for Omnibus this would be: unix:/var/opt/gitlab/gitlab-workhorse/socket # 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; server unix:/home/git/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
} }
...@@ -162,7 +162,7 @@ server { ...@@ -162,7 +162,7 @@ server {
error_page 502 /502.html; error_page 502 /502.html;
error_page 503 /503.html; error_page 503 /503.html;
location ~ ^/(404|422|500|502|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 # for Omnibus this would be: /opt/gitlab/embedded/service/gitlab-rails/public
root /home/git/gitlab/public; root /home/git/gitlab/public;
internal; internal;
......
...@@ -48,7 +48,7 @@ describe Gitlab::Auth::LDAP::Access do ...@@ -48,7 +48,7 @@ describe Gitlab::Auth::LDAP::Access do
it 'logs the reason' do it 'logs the reason' do
expect(Gitlab::AppLogger).to receive(:info).with( expect(Gitlab::AppLogger).to receive(:info).with(
"LDAP account \"123456\" does not exist anymore, " \ "LDAP account \"123456\" does not exist anymore, " \
"blocking Gitlab user \"#{user.name}\" (#{user.email})" "blocking GitLab user \"#{user.name}\" (#{user.email})"
) )
access.allowed? access.allowed?
...@@ -79,7 +79,7 @@ describe Gitlab::Auth::LDAP::Access do ...@@ -79,7 +79,7 @@ describe Gitlab::Auth::LDAP::Access do
it 'logs the reason' do it 'logs the reason' do
expect(Gitlab::AppLogger).to receive(:info).with( expect(Gitlab::AppLogger).to receive(:info).with(
"LDAP account \"123456\" is disabled in Active Directory, " \ "LDAP account \"123456\" is disabled in Active Directory, " \
"blocking Gitlab user \"#{user.name}\" (#{user.email})" "blocking GitLab user \"#{user.name}\" (#{user.email})"
) )
access.allowed? access.allowed?
...@@ -123,7 +123,7 @@ describe Gitlab::Auth::LDAP::Access do ...@@ -123,7 +123,7 @@ describe Gitlab::Auth::LDAP::Access do
it 'logs the reason' do it 'logs the reason' do
expect(Gitlab::AppLogger).to receive(:info).with( expect(Gitlab::AppLogger).to receive(:info).with(
"LDAP account \"123456\" is not disabled anymore, " \ "LDAP account \"123456\" is not disabled anymore, " \
"unblocking Gitlab user \"#{user.name}\" (#{user.email})" "unblocking GitLab user \"#{user.name}\" (#{user.email})"
) )
access.allowed? access.allowed?
...@@ -161,7 +161,7 @@ describe Gitlab::Auth::LDAP::Access do ...@@ -161,7 +161,7 @@ describe Gitlab::Auth::LDAP::Access do
it 'logs the reason' do it 'logs the reason' do
expect(Gitlab::AppLogger).to receive(:info).with( expect(Gitlab::AppLogger).to receive(:info).with(
"LDAP account \"123456\" does not exist anymore, " \ "LDAP account \"123456\" does not exist anymore, " \
"blocking Gitlab user \"#{user.name}\" (#{user.email})" "blocking GitLab user \"#{user.name}\" (#{user.email})"
) )
access.allowed? access.allowed?
...@@ -183,7 +183,7 @@ describe Gitlab::Auth::LDAP::Access do ...@@ -183,7 +183,7 @@ describe Gitlab::Auth::LDAP::Access do
it 'logs the reason' do it 'logs the reason' do
expect(Gitlab::AppLogger).to receive(:info).with( expect(Gitlab::AppLogger).to receive(:info).with(
"LDAP account \"123456\" is available again, " \ "LDAP account \"123456\" is available again, " \
"unblocking Gitlab user \"#{user.name}\" (#{user.email})" "unblocking GitLab user \"#{user.name}\" (#{user.email})"
) )
access.allowed? access.allowed?
......
...@@ -34,7 +34,7 @@ describe Gitlab::Middleware::ReadOnly do ...@@ -34,7 +34,7 @@ describe Gitlab::Middleware::ReadOnly do
end end
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']] } } let(:fake_app) { lambda { |env| [200, { 'Content-Type' => 'text/plain' }, ['OK']] } }
before do before do
......
...@@ -52,7 +52,7 @@ RSpec.describe InstanceConfiguration do ...@@ -52,7 +52,7 @@ RSpec.describe InstanceConfiguration do
expect(gitlab_pages).to eq(Settings.pages.symbolize_keys) expect(gitlab_pages).to eq(Settings.pages.symbolize_keys)
end 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) expect(gitlab_pages.keys).to include(:ip_address)
end end
......
...@@ -121,7 +121,7 @@ describe 'OpenID Connect requests' do ...@@ -121,7 +121,7 @@ describe 'OpenID Connect requests' do
expect(@payload).to match(a_hash_including(id_token_claims)) expect(@payload).to match(a_hash_including(id_token_claims))
end end
it 'includes the Gitlab root URL' do it 'includes the GitLab root URL' do
expect(@payload['iss']).to eq Gitlab.config.gitlab.url expect(@payload['iss']).to eq Gitlab.config.gitlab.url
end end
......
...@@ -145,7 +145,7 @@ describe Auth::ContainerRegistryAuthenticationService do ...@@ -145,7 +145,7 @@ describe Auth::ContainerRegistryAuthenticationService do
{ scopes: ["registry:catalog:*"] } { scopes: ["registry:catalog:*"] }
end 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 'an inaccessible'
it_behaves_like 'not a container repository factory' it_behaves_like 'not a container repository factory'
end end
......
...@@ -22,7 +22,7 @@ describe Groups::TransferService, :postgresql do ...@@ -22,7 +22,7 @@ describe Groups::TransferService, :postgresql do
end end
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) } let(:new_parent_group) { create(:group, :public) }
before do before do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment