Skip to content
Snippets Groups Projects
Commit 2f6a20ce authored by Yoginth's avatar Yoginth Committed by Douglas Barbosa Alexandre
Browse files

Fix typos in the whole gitlab-ce project

parent 9c1470c2
No related branches found
No related tags found
No related merge requests found
Showing
with 27 additions and 27 deletions
Loading
Loading
@@ -17,10 +17,10 @@ Set the title to: `Description of the original issue`
 
#### Backports
 
- [ ] Once the MR is ready to be merged, create MRs targetting the last 3 releases, plus the current RC if between the 7th and 22nd of the month.
- [ ] Once the MR is ready to be merged, create MRs targeting the last 3 releases, plus the current RC if between the 7th and 22nd of the month.
- [ ] At this point, it might be easy to squash the commits from the MR into one
- You can use the script `bin/secpick` instead of the following steps, to help you cherry-picking. See the [secpick documentation]
- [ ] Create each MR targetting the stable branch `X-Y-stable`, using the "Security Release" merge request template.
- [ ] Create each MR targeting the stable branch `X-Y-stable`, using the "Security Release" merge request template.
- Every merge request will have its own set of TODOs, so make sure to
complete those.
- [ ] Make sure all MRs have a link in the [links section](#links)
Loading
Loading
Loading
Loading
@@ -15,7 +15,7 @@ import { sprintf, __ } from '../../locale';
// </pre>
//
 
// This is an arbitary number; Can be iterated upon when suitable.
// This is an arbitrary number; Can be iterated upon when suitable.
const MAX_CHAR_LIMIT = 5000;
 
export default function renderMermaid($els) {
Loading
Loading
Loading
Loading
@@ -27,14 +27,14 @@ export default function highlight(string, match = '', matchPrefix = '<b>', match
 
const sanitizedValue = sanitize(string.toString(), { allowedTags: [] });
 
// occurences is an array of character indices that should be
// occurrences is an array of character indices that should be
// highlighted in the original string, i.e. [3, 4, 5, 7]
const occurences = fuzzaldrinPlus.match(sanitizedValue, match.toString());
const occurrences = fuzzaldrinPlus.match(sanitizedValue, match.toString());
 
return sanitizedValue
.split('')
.map((character, i) => {
if (_.contains(occurences, i)) {
if (_.contains(occurrences, i)) {
return `${matchPrefix}${character}${matchSuffix}`;
}
 
Loading
Loading
Loading
Loading
@@ -14,7 +14,7 @@
}
 
.member {
&.is-overriden {
&.is-overridden {
.btn-ldap-override {
display: none !important;
}
Loading
Loading
Loading
Loading
@@ -46,7 +46,7 @@ module Resolvers
def resolve(**args)
# The project could have been loaded in batch by `BatchLoader`.
# At this point we need the `id` of the project to query for issues, so
# make sure it's loaded and not `nil` before continueing.
# make sure it's loaded and not `nil` before continuing.
project.sync if project.respond_to?(:sync)
return Issue.none if project.nil?
 
Loading
Loading
Loading
Loading
@@ -39,7 +39,7 @@ module Clusters
end
 
# Will be addressed in future MRs
# We need to investigate and document what will be permenantly deleted.
# We need to investigate and document what will be permanently deleted.
def allowed_to_uninstall?
false
end
Loading
Loading
Loading
Loading
@@ -11,7 +11,7 @@ Rails.application.configure do
# and recreated between test runs. Don't rely on the data there!
 
# Enabling caching of classes slows start-up time because all controllers
# are loaded at initalization, but it reduces memory and load because files
# are loaded at initialization, but it reduces memory and load because files
# are not reloaded with every request. For example, caching is not necessary
# for loading database migrations but useful for handling Knapsack specs.
config.cache_classes = ENV['CACHE_CLASSES'] == 'true'
Loading
Loading
Loading
Loading
@@ -2,7 +2,7 @@
# the extension of the full URL path if no explicit `format` param or `Accept`
# header is provided, like when simply browsing to a page in your browser.
#
# This is undesireable in GitLab, because many of our paths will end in a ref or
# This is undesirable in GitLab, because many of our paths will end in a ref or
# blob name that can end with any extension, while these pages should still be
# presented as HTML unless otherwise specified.
 
Loading
Loading
# This is the same as DisableInvalidServiceTemplates. Later migrations may have
# inadventently enabled some invalid templates again.
# inadvertently enabled some invalid templates again.
#
class DisableInvalidServiceTemplates2 < ActiveRecord::Migration[4.2]
DOWNTIME = false
Loading
Loading
Loading
Loading
@@ -67,7 +67,7 @@ apt-get install nfs-common
 
### Step 2 - Create Mount Points on Client
 
Create a directroy on the client that we can mount the shared directory from the host.
Create a directory on the client that we can mount the shared directory from the host.
Please note that if your mount point directory contains any files they will be hidden
once the remote shares are mounted. An empty/new directory on the client is recommended
for this purpose.
Loading
Loading
Loading
Loading
@@ -193,5 +193,5 @@ By using pipelines for merge requests, GitLab exposes additional predefined vari
Those variables contain information of the associated merge request, so that it's useful
to integrate your job with [GitLab Merge Request API](../../api/merge_requests.md).
 
You can find the list of avilable variables in [the reference sheet](../variables/predefined_variables.md).
You can find the list of available variables in [the reference sheet](../variables/predefined_variables.md).
The variable names begin with the `CI_MERGE_REQUEST_` prefix.
Loading
Loading
@@ -910,7 +910,7 @@ information on managing page-specific javascript within EE.
### script tag
 
#### Child Component only used in EE
To seperate Vue template differences we should [async import the components](https://vuejs.org/v2/guide/components-dynamic-async.html#Async-Components).
To separate Vue template differences we should [async import the components](https://vuejs.org/v2/guide/components-dynamic-async.html#Async-Components).
 
Doing this allows for us to load the correct component in EE whilst in CE
we can load a empty component that renders nothing. This code **should**
Loading
Loading
Loading
Loading
@@ -43,7 +43,7 @@ Example `CODEOWNERS` file:
 
# app/ @commented-rule
 
# We can specifiy a default match using wildcards:
# We can specify a default match using wildcards:
* @default-codeowner
 
# Rules defined later in the file take precedence over the rules
Loading
Loading
Loading
Loading
@@ -131,7 +131,7 @@ From the project issue list page and the project merge request list page, you ca
 
From the group issue list page and the group merge request list page, you can [filter](../search/index.md#issues-and-merge-requests) by both group labels (including subgroup ancestors and subgroup descendants) and project labels.
 
From the group epic list page, you can [filter](../search/index.md#issues-and-merge-requests) by both current group labels as well as decendent group labels.
From the group epic list page, you can [filter](../search/index.md#issues-and-merge-requests) by both current group labels as well as descendant group labels.
 
![Labels group issues](img/labels_group_issues.png)
 
Loading
Loading
Loading
Loading
@@ -16344,7 +16344,7 @@
"aliases": [],
"aliases_ascii": [],
"keywords": [
"accomodation",
"accommodation",
"building",
"checkin",
"whotel",
Loading
Loading
Loading
Loading
@@ -20,7 +20,7 @@ module BitbucketServer
end
 
def browse_url
# The JSON reponse contains an array of 1 element. Not sure if there
# The JSON response contains an array of 1 element. Not sure if there
# are cases where multiple links would be provided.
raw.dig('links', 'self').first.fetch('href')
end
Loading
Loading
Loading
Loading
@@ -95,7 +95,7 @@ module Gitlab
local_labels = available_labels(project_id)
 
# get all label links for the given resource (issue/MR)
# which reference a label not included in avaiable_labels
# which reference a label not included in available_labels
# (other than its project labels and labels of ancestor groups)
cross_labels = LabelLink
.select('label_id, labels.title as title, labels.color as color, label_links.id as label_link_id')
Loading
Loading
Loading
Loading
@@ -7,11 +7,11 @@ module Gitlab
module Limit
class Activity < Chain::Base
def perform!
# to be overriden in EE
# to be overridden in EE
end
 
def break?
false # to be overriden in EE
false # to be overridden in EE
end
end
end
Loading
Loading
Loading
Loading
@@ -7,11 +7,11 @@ module Gitlab
module Limit
class Size < Chain::Base
def perform!
# to be overriden in EE
# to be overridden in EE
end
 
def break?
false # to be overriden in EE
false # to be overridden in EE
end
end
end
Loading
Loading
Loading
Loading
@@ -36,10 +36,10 @@ module Gitlab
 
class AllowedArrayValuesValidator < ActiveModel::EachValidator
def validate_each(record, attribute, value)
unkown_values = value - options[:in]
unless unkown_values.empty?
unknown_values = value - options[:in]
unless unknown_values.empty?
record.errors.add(attribute, "contains unknown values: " +
unkown_values.join(', '))
unknown_values.join(', '))
end
end
end
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment