Commit 2b3b7909 authored by Amy Qualls's avatar Amy Qualls

Merge branch '233449-aqualls-caps-caps-caps' into 'master'

Fix code comments with bad capitalization

See merge request gitlab-org/gitlab!58911
parents 3916d605 46fe408c
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<!-- <!--
Please describe why the end-to-end test is being quarantined/ de-quarantined. Please describe why the end-to-end test is being quarantined/ de-quarantined.
Please note that the aim of quarantining a test is not to get back a green pipeline, but rather to reduce Please note that the aim of quarantining a test is not to get back a green pipeline, but rather to reduce
the noise (due to constantly failing tests, flaky tests, and so on) so that new failures are not missed. the noise (due to constantly failing tests, flaky tests, and so on) so that new failures are not missed.
--> -->
...@@ -24,15 +24,15 @@ the noise (due to constantly failing tests, flaky tests, and so on) so that new ...@@ -24,15 +24,15 @@ the noise (due to constantly failing tests, flaky tests, and so on) so that new
- [ ] Note if the test should be [quarantined for a specific environment](https://docs.gitlab.com/ee/development/testing_guide/end_to_end/environment_selection.html#quarantining-a-test-for-a-specific-environment). - [ ] Note if the test should be [quarantined for a specific environment](https://docs.gitlab.com/ee/development/testing_guide/end_to_end/environment_selection.html#quarantining-a-test-for-a-specific-environment).
- [ ] Dequarantine test check-list - [ ] Dequarantine test check-list
- [ ] Follow the [Dequarantining Tests guide](https://about.gitlab.com/handbook/engineering/quality/guidelines/debugging-qa-test-failures/#dequarantining-tests). - [ ] Follow the [Dequarantining Tests guide](https://about.gitlab.com/handbook/engineering/quality/guidelines/debugging-qa-test-failures/#dequarantining-tests).
- [ ] Confirm the test consistently passes on the target GitLab environment(s). - [ ] Confirm the test consistently passes on the target GitLab environment(s).
- [ ] (Optionally) [Trigger a manual GitLab-QA pipeline](https://about.gitlab.com/handbook/engineering/quality/guidelines/tips-and-tricks/#running-gitlab-qa-pipeline-against-a-specific-gitlab-release) against a specific GitLab environment using the `RELEASE` variable from the `package-and-qa` job of the current Merge Request. - [ ] (Optionally) [Trigger a manual GitLab-QA pipeline](https://about.gitlab.com/handbook/engineering/quality/guidelines/tips-and-tricks/#running-gitlab-qa-pipeline-against-a-specific-gitlab-release) against a specific GitLab environment using the `RELEASE` variable from the `package-and-qa` job of the current merge request.
- [ ] To ensure a faster turnaround, ask in the `#quality` Slack channel for someone to review and merge the merge request, rather than assigning it directly. - [ ] To ensure a faster turnaround, ask in the `#quality` Slack channel for someone to review and merge the merge request, rather than assigning it directly.
<!-- Base labels. --> <!-- Base labels. -->
/label ~"Quality" ~"QA" ~"feature" ~"feature::maintenance" /label ~"Quality" ~"QA" ~"feature" ~"feature::maintenance"
<!-- Labels to pick into auto-deploy. --> <!-- Labels to pick into auto-deploy. -->
/label ~"Pick into auto-deploy" ~"priority::1" ~"severity::1" /label ~"Pick into auto-deploy" ~"priority::1" ~"severity::1"
<!-- <!--
Choose the stage that appears in the test path, e.g. ~"devops::create" for Choose the stage that appears in the test path, e.g. ~"devops::create" for
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
# This file should not receive new settings. All configuration options # # This file should not receive new settings. All configuration options #
# * are being moved to ApplicationSetting model! # # * are being moved to ApplicationSetting model! #
# If a setting requires an application restart say so in that screen. # # If a setting requires an application restart say so in that screen. #
# If you change this file in a Merge Request, please also create # # If you change this file in a merge request, please also create #
# a MR on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests. # # a MR on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests. #
# For more details see https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/settings/gitlab.yml.md # # For more details see https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/settings/gitlab.yml.md #
######################################################################## ########################################################################
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# #
# For full list of options and their values see http://api.rubyonrails.org/classes/ActionMailer/Base.html # For full list of options and their values see http://api.rubyonrails.org/classes/ActionMailer/Base.html
# #
# If you change this file in a Merge Request, please also create a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests # If you change this file in a merge request, please also create a merge request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
if Rails.env.production? if Rails.env.production?
Rails.application.config.action_mailer.delivery_method = :smtp Rails.application.config.action_mailer.delivery_method = :smtp
......
--- ---
key_path: counts.web_ide_merge_requests key_path: counts.web_ide_merge_requests
description: Count of Merge Requests created from Web IDE description: Count of merge requests created from Web IDE
product_section: dev product_section: dev
product_stage: create product_stage: create
product_group: group::editor product_group: group::editor
......
# If you change this file in a Merge Request, please also create # If you change this file in a merge request, please also create
# a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests # a merge request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
# #
development: development:
url: redis://localhost:6379/10 url: redis://localhost:6379/10
......
# If you change this file in a Merge Request, please also create # If you change this file in a merge request, please also create
# a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests # a merge request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
# #
development: development:
url: redis://localhost:6379/11 url: redis://localhost:6379/11
......
# If you change this file in a Merge Request, please also create # If you change this file in a merge request, please also create
# a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests # a merge request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
# #
development: development:
url: redis://localhost:6379/12 url: redis://localhost:6379/12
......
# If you change this file in a Merge Request, please also create # If you change this file in a merge request, please also create
# a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests # a merge request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
# #
development: development:
url: redis://localhost:6379 url: redis://localhost:6379
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
# See http://unicorn.bogomips.org/Unicorn/Configurator.html for complete # See http://unicorn.bogomips.org/Unicorn/Configurator.html for complete
# documentation. # documentation.
# Note: If you change this file in a Merge Request, please also create a # Note: If you change this file in a merge request, please also create a
# Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests # merge request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
# Relative URL support # Relative URL support
# WARNING: We recommend using an FQDN to host GitLab in a root path instead # WARNING: We recommend using an FQDN to host GitLab in a root path instead
......
...@@ -5986,7 +5986,7 @@ Tiers: `free`, `premium`, `ultimate` ...@@ -5986,7 +5986,7 @@ Tiers: `free`, `premium`, `ultimate`
### `counts.web_ide_merge_requests` ### `counts.web_ide_merge_requests`
Count of Merge Requests created from Web IDE Count of merge requests created from Web IDE
[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml) [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml)
......
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