Commit 7115bd81 authored by Douglas Barbosa Alexandre's avatar Douglas Barbosa Alexandre

Merge branch 'fix-typo' into 'master'

Fix typos in the whole gitlab-ce project

See merge request gitlab-org/gitlab-ce!28395
parents 9c1470c2 2f6a20ce
...@@ -17,10 +17,10 @@ Set the title to: `Description of the original issue` ...@@ -17,10 +17,10 @@ Set the title to: `Description of the original issue`
#### Backports #### 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 - [ ] 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] - 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 - Every merge request will have its own set of TODOs, so make sure to
complete those. complete those.
- [ ] Make sure all MRs have a link in the [links section](#links) - [ ] Make sure all MRs have a link in the [links section](#links)
......
...@@ -15,7 +15,7 @@ import { sprintf, __ } from '../../locale'; ...@@ -15,7 +15,7 @@ import { sprintf, __ } from '../../locale';
// </pre> // </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; const MAX_CHAR_LIMIT = 5000;
export default function renderMermaid($els) { export default function renderMermaid($els) {
......
...@@ -27,14 +27,14 @@ export default function highlight(string, match = '', matchPrefix = '<b>', match ...@@ -27,14 +27,14 @@ export default function highlight(string, match = '', matchPrefix = '<b>', match
const sanitizedValue = sanitize(string.toString(), { allowedTags: [] }); 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] // 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 return sanitizedValue
.split('') .split('')
.map((character, i) => { .map((character, i) => {
if (_.contains(occurences, i)) { if (_.contains(occurrences, i)) {
return `${matchPrefix}${character}${matchSuffix}`; return `${matchPrefix}${character}${matchSuffix}`;
} }
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
} }
.member { .member {
&.is-overriden { &.is-overridden {
.btn-ldap-override { .btn-ldap-override {
display: none !important; display: none !important;
} }
......
...@@ -46,7 +46,7 @@ module Resolvers ...@@ -46,7 +46,7 @@ module Resolvers
def resolve(**args) def resolve(**args)
# The project could have been loaded in batch by `BatchLoader`. # 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 # 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) project.sync if project.respond_to?(:sync)
return Issue.none if project.nil? return Issue.none if project.nil?
......
...@@ -39,7 +39,7 @@ module Clusters ...@@ -39,7 +39,7 @@ module Clusters
end end
# Will be addressed in future MRs # 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? def allowed_to_uninstall?
false false
end end
......
...@@ -11,7 +11,7 @@ Rails.application.configure do ...@@ -11,7 +11,7 @@ Rails.application.configure do
# and recreated between test runs. Don't rely on the data there! # and recreated between test runs. Don't rely on the data there!
# Enabling caching of classes slows start-up time because all controllers # 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 # are not reloaded with every request. For example, caching is not necessary
# for loading database migrations but useful for handling Knapsack specs. # for loading database migrations but useful for handling Knapsack specs.
config.cache_classes = ENV['CACHE_CLASSES'] == 'true' config.cache_classes = ENV['CACHE_CLASSES'] == 'true'
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# the extension of the full URL path if no explicit `format` param or `Accept` # 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. # 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 # blob name that can end with any extension, while these pages should still be
# presented as HTML unless otherwise specified. # presented as HTML unless otherwise specified.
......
# This is the same as DisableInvalidServiceTemplates. Later migrations may have # 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] class DisableInvalidServiceTemplates2 < ActiveRecord::Migration[4.2]
DOWNTIME = false DOWNTIME = false
......
...@@ -67,7 +67,7 @@ apt-get install nfs-common ...@@ -67,7 +67,7 @@ apt-get install nfs-common
### Step 2 - Create Mount Points on Client ### 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 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 once the remote shares are mounted. An empty/new directory on the client is recommended
for this purpose. for this purpose.
......
...@@ -193,5 +193,5 @@ By using pipelines for merge requests, GitLab exposes additional predefined vari ...@@ -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 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). 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. The variable names begin with the `CI_MERGE_REQUEST_` prefix.
...@@ -910,7 +910,7 @@ information on managing page-specific javascript within EE. ...@@ -910,7 +910,7 @@ information on managing page-specific javascript within EE.
### script tag ### script tag
#### Child Component only used in EE #### 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 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** we can load a empty component that renders nothing. This code **should**
......
...@@ -43,7 +43,7 @@ Example `CODEOWNERS` file: ...@@ -43,7 +43,7 @@ Example `CODEOWNERS` file:
# app/ @commented-rule # app/ @commented-rule
# We can specifiy a default match using wildcards: # We can specify a default match using wildcards:
* @default-codeowner * @default-codeowner
# Rules defined later in the file take precedence over the rules # Rules defined later in the file take precedence over the rules
......
...@@ -131,7 +131,7 @@ From the project issue list page and the project merge request list page, you ca ...@@ -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 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) ![Labels group issues](img/labels_group_issues.png)
......
...@@ -16344,7 +16344,7 @@ ...@@ -16344,7 +16344,7 @@
"aliases": [], "aliases": [],
"aliases_ascii": [], "aliases_ascii": [],
"keywords": [ "keywords": [
"accomodation", "accommodation",
"building", "building",
"checkin", "checkin",
"whotel", "whotel",
......
...@@ -20,7 +20,7 @@ module BitbucketServer ...@@ -20,7 +20,7 @@ module BitbucketServer
end end
def browse_url 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. # are cases where multiple links would be provided.
raw.dig('links', 'self').first.fetch('href') raw.dig('links', 'self').first.fetch('href')
end end
......
...@@ -95,7 +95,7 @@ module Gitlab ...@@ -95,7 +95,7 @@ module Gitlab
local_labels = available_labels(project_id) local_labels = available_labels(project_id)
# get all label links for the given resource (issue/MR) # 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) # (other than its project labels and labels of ancestor groups)
cross_labels = LabelLink cross_labels = LabelLink
.select('label_id, labels.title as title, labels.color as color, label_links.id as label_link_id') .select('label_id, labels.title as title, labels.color as color, label_links.id as label_link_id')
......
...@@ -7,11 +7,11 @@ module Gitlab ...@@ -7,11 +7,11 @@ module Gitlab
module Limit module Limit
class Activity < Chain::Base class Activity < Chain::Base
def perform! def perform!
# to be overriden in EE # to be overridden in EE
end end
def break? def break?
false # to be overriden in EE false # to be overridden in EE
end end
end end
end end
......
...@@ -7,11 +7,11 @@ module Gitlab ...@@ -7,11 +7,11 @@ module Gitlab
module Limit module Limit
class Size < Chain::Base class Size < Chain::Base
def perform! def perform!
# to be overriden in EE # to be overridden in EE
end end
def break? def break?
false # to be overriden in EE false # to be overridden in EE
end end
end end
end end
......
...@@ -36,10 +36,10 @@ module Gitlab ...@@ -36,10 +36,10 @@ module Gitlab
class AllowedArrayValuesValidator < ActiveModel::EachValidator class AllowedArrayValuesValidator < ActiveModel::EachValidator
def validate_each(record, attribute, value) def validate_each(record, attribute, value)
unkown_values = value - options[:in] unknown_values = value - options[:in]
unless unkown_values.empty? unless unknown_values.empty?
record.errors.add(attribute, "contains unknown values: " + record.errors.add(attribute, "contains unknown values: " +
unkown_values.join(', ')) unknown_values.join(', '))
end end
end end
end end
......
...@@ -79,7 +79,7 @@ module Gitlab ...@@ -79,7 +79,7 @@ module Gitlab
def tree_entry(ref, path, limit = nil) def tree_entry(ref, path, limit = nil)
if Pathname.new(path).cleanpath.to_s.start_with?('../') if Pathname.new(path).cleanpath.to_s.start_with?('../')
# The TreeEntry RPC should return an empty reponse in this case but in # The TreeEntry RPC should return an empty response in this case but in
# Gitaly 0.107.0 and earlier we get an exception instead. This early return # Gitaly 0.107.0 and earlier we get an exception instead. This early return
# saves us a Gitaly roundtrip while also avoiding the exception. # saves us a Gitaly roundtrip while also avoiding the exception.
return return
......
...@@ -45,7 +45,7 @@ module Gitlab ...@@ -45,7 +45,7 @@ module Gitlab
def self.redirect_legacy_paths(router, *paths) def self.redirect_legacy_paths(router, *paths)
build_redirect_path = lambda do |request, _params, path| build_redirect_path = lambda do |request, _params, path|
# Only replace the last occurence of `path`. # Only replace the last occurrence of `path`.
# #
# `request.fullpath` includes the querystring # `request.fullpath` includes the querystring
new_path = request.path.sub(%r{/#{path}(/*)(?!.*#{path})}, "/-/#{path}\\1") new_path = request.path.sub(%r{/#{path}(/*)(?!.*#{path})}, "/-/#{path}\\1")
......
...@@ -121,7 +121,7 @@ module SystemCheck ...@@ -121,7 +121,7 @@ module SystemCheck
# #
# @see #try_fixing_it # @see #try_fixing_it
# @see #fix_and_rerun # @see #fix_and_rerun
# @see #for_more_infromation # @see #for_more_information
def show_error def show_error
raise NotImplementedError raise NotImplementedError
end end
......
...@@ -6,7 +6,7 @@ A good example is a user being logged in as a pre-condition for testing the feat ...@@ -6,7 +6,7 @@ A good example is a user being logged in as a pre-condition for testing the feat
But if the login feature is already covered with end-to-end tests through the GUI, there is no reason to perform such an expensive task to test the functionality of creating a project, or importing a repo, even if this features depend on a user being logged in. Let's see an example to make things clear. But if the login feature is already covered with end-to-end tests through the GUI, there is no reason to perform such an expensive task to test the functionality of creating a project, or importing a repo, even if this features depend on a user being logged in. Let's see an example to make things clear.
Let's say that, on average, the process to perform a successfull login through the GUI takes 2 seconds. Let's say that, on average, the process to perform a successful login through the GUI takes 2 seconds.
Now, realize that almost all tests need the user to be logged in, and that we need every test to run in isolation, meaning that tests cannot interfere with each other. This would mean that for every test the user needs to log in, and "waste 2 seconds". Now, realize that almost all tests need the user to be logged in, and that we need every test to run in isolation, meaning that tests cannot interfere with each other. This would mean that for every test the user needs to log in, and "waste 2 seconds".
......
...@@ -5,7 +5,7 @@ module QA ...@@ -5,7 +5,7 @@ module QA
describe 'filter issue comments activities' do describe 'filter issue comments activities' do
let(:issue_title) { 'issue title' } let(:issue_title) { 'issue title' }
it 'user filters comments and activites in an issue' do it 'user filters comments and activities in an issue' do
Runtime::Browser.visit(:gitlab, Page::Main::Login) Runtime::Browser.visit(:gitlab, Page::Main::Login)
Page::Main::Login.act { sign_in_using_credentials } Page::Main::Login.act { sign_in_using_credentials }
......
...@@ -29,7 +29,7 @@ sass.render( ...@@ -29,7 +29,7 @@ sass.render(
// We just use postcss to create a CSS tree // We just use postcss to create a CSS tree
postcss([]) postcss([])
.process(cssResult, { .process(cssResult, {
// This supresses a postcss warning // This suppresses a postcss warning
from: undefined, from: undefined,
}) })
.then(result => { .then(result => {
......
...@@ -155,11 +155,11 @@ describe('text_utility', () => { ...@@ -155,11 +155,11 @@ describe('text_utility', () => {
expect(textUtils.truncateNamespace('a / b')).toBe('a'); expect(textUtils.truncateNamespace('a / b')).toBe('a');
}); });
it(`should return the first 2 namespaces if the namespace inlcudes exactly 2 levels`, () => { it(`should return the first 2 namespaces if the namespace includes exactly 2 levels`, () => {
expect(textUtils.truncateNamespace('a / b / c')).toBe('a / b'); expect(textUtils.truncateNamespace('a / b / c')).toBe('a / b');
}); });
it(`should return the first and last namespaces, separated by "...", if the namespace inlcudes more than 2 levels`, () => { it(`should return the first and last namespaces, separated by "...", if the namespace includes more than 2 levels`, () => {
expect(textUtils.truncateNamespace('a / b / c / d')).toBe('a / ... / c'); expect(textUtils.truncateNamespace('a / b / c / d')).toBe('a / ... / c');
expect(textUtils.truncateNamespace('a / b / c / d / e / f / g / h / i')).toBe('a / ... / h'); expect(textUtils.truncateNamespace('a / b / c / d / e / f / g / h / i')).toBe('a / ... / h');
}); });
......
...@@ -99,7 +99,7 @@ describe('ProjectSelector component', () => { ...@@ -99,7 +99,7 @@ describe('ProjectSelector component', () => {
expect(trimText(noResultsEl.text())).toEqual('Sorry, no projects matched your search'); expect(trimText(noResultsEl.text())).toEqual('Sorry, no projects matched your search');
}); });
it(`shows a "minimum seach query" message if showMinimumSearchQueryMessage === true`, () => { it(`shows a "minimum search query" message if showMinimumSearchQueryMessage === true`, () => {
wrapper.setProps({ showMinimumSearchQueryMessage: true }); wrapper.setProps({ showMinimumSearchQueryMessage: true });
expect(wrapper.contains('.js-minimum-search-query-message')).toBe(true); expect(wrapper.contains('.js-minimum-search-query-message')).toBe(true);
......
...@@ -80,7 +80,7 @@ describe Banzai::Filter::SyntaxHighlightFilter do ...@@ -80,7 +80,7 @@ describe Banzai::Filter::SyntaxHighlightFilter do
let(:lang) { 'suggestion' } let(:lang) { 'suggestion' }
let(:lang_params) { '-1+10' } let(:lang_params) { '-1+10' }
it "delimits on the first appearence" do it "delimits on the first appearance" do
result = filter(%{<pre><code lang="#{lang}#{delimiter}#{lang_params}#{delimiter}more-things">This is a test</code></pre>}) result = filter(%{<pre><code lang="#{lang}#{delimiter}#{lang_params}#{delimiter}more-things">This is a test</code></pre>})
expect(result.to_html).to eq(%{<pre class="code highlight js-syntax-highlight #{lang}" lang="#{lang}" #{data_attr}="#{lang_params}#{delimiter}more-things" v-pre="true"><code><span id="LC1" class="line" lang="#{lang}">This is a test</span></code></pre>}) expect(result.to_html).to eq(%{<pre class="code highlight js-syntax-highlight #{lang}" lang="#{lang}" #{data_attr}="#{lang_params}#{delimiter}more-things" v-pre="true"><code><span id="LC1" class="line" lang="#{lang}">This is a test</span></code></pre>})
......
...@@ -13,7 +13,7 @@ describe API::Discussions do ...@@ -13,7 +13,7 @@ describe API::Discussions do
let!(:issue) { create(:issue, project: project, author: user) } let!(:issue) { create(:issue, project: project, author: user) }
let!(:issue_note) { create(:discussion_note_on_issue, noteable: issue, project: project, author: user) } let!(:issue_note) { create(:discussion_note_on_issue, noteable: issue, project: project, author: user) }
it_behaves_like 'discussions API', 'projects', 'issues', 'iid', can_reply_to_invididual_notes: true do it_behaves_like 'discussions API', 'projects', 'issues', 'iid', can_reply_to_individual_notes: true do
let(:parent) { project } let(:parent) { project }
let(:noteable) { issue } let(:noteable) { issue }
let(:note) { issue_note } let(:note) { issue_note }
...@@ -37,7 +37,7 @@ describe API::Discussions do ...@@ -37,7 +37,7 @@ describe API::Discussions do
let!(:diff_note) { create(:diff_note_on_merge_request, noteable: noteable, project: project, author: user) } let!(:diff_note) { create(:diff_note_on_merge_request, noteable: noteable, project: project, author: user) }
let(:parent) { project } let(:parent) { project }
it_behaves_like 'discussions API', 'projects', 'merge_requests', 'iid', can_reply_to_invididual_notes: true it_behaves_like 'discussions API', 'projects', 'merge_requests', 'iid', can_reply_to_individual_notes: true
it_behaves_like 'diff discussions API', 'projects', 'merge_requests', 'iid' it_behaves_like 'diff discussions API', 'projects', 'merge_requests', 'iid'
it_behaves_like 'resolvable discussions API', 'projects', 'merge_requests', 'iid' it_behaves_like 'resolvable discussions API', 'projects', 'merge_requests', 'iid'
end end
......
...@@ -285,7 +285,7 @@ describe Auth::ContainerRegistryAuthenticationService do ...@@ -285,7 +285,7 @@ describe Auth::ContainerRegistryAuthenticationService do
it_behaves_like 'not a container repository factory' it_behaves_like 'not a container repository factory'
end end
context 'disallow guest to delete images since regsitry 2.7' do context 'disallow guest to delete images since registry 2.7' do
before do before do
project.add_guest(current_user) project.add_guest(current_user)
end end
......
shared_examples 'discussions API' do |parent_type, noteable_type, id_name, can_reply_to_invididual_notes: false| shared_examples 'discussions API' do |parent_type, noteable_type, id_name, can_reply_to_individual_notes: false|
describe "GET /#{parent_type}/:id/#{noteable_type}/:noteable_id/discussions" do describe "GET /#{parent_type}/:id/#{noteable_type}/:noteable_id/discussions" do
it "returns an array of discussions" do it "returns an array of discussions" do
get api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/discussions", user) get api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/discussions", user)
...@@ -144,7 +144,7 @@ shared_examples 'discussions API' do |parent_type, noteable_type, id_name, can_r ...@@ -144,7 +144,7 @@ shared_examples 'discussions API' do |parent_type, noteable_type, id_name, can_r
"discussions/#{note.discussion_id}/notes", user), params: { body: 'hi!' } "discussions/#{note.discussion_id}/notes", user), params: { body: 'hi!' }
end end
if can_reply_to_invididual_notes if can_reply_to_individual_notes
it 'creates a new discussion' do it 'creates a new discussion' do
expect(response).to have_gitlab_http_status(201) expect(response).to have_gitlab_http_status(201)
expect(json_response['body']).to eq('hi!') expect(json_response['body']).to eq('hi!')
......
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