Commit 3262d481 authored by George Tsiolis's avatar George Tsiolis

Fix typos in specs and js

parent b88bc834
...@@ -66,7 +66,7 @@ export default class ProtectedEnvironmentCreate { ...@@ -66,7 +66,7 @@ export default class ProtectedEnvironmentCreate {
callback(results); callback(results);
}) })
.catch(() => { .catch(() => {
Flash('An error occured while fetching environments.'); Flash('An error occurred while fetching environments.');
callback([]); callback([]);
}); });
} }
......
...@@ -73,7 +73,7 @@ export default { ...@@ -73,7 +73,7 @@ export default {
}) })
.catch(() => { .catch(() => {
this.unapproving = false; this.unapproving = false;
Flash(s__('mrWidget|An error occured while removing your approval.')); Flash(s__('mrWidget|An error occurred while removing your approval.'));
}); });
}, },
}, },
......
...@@ -45,7 +45,7 @@ export default { ...@@ -45,7 +45,7 @@ export default {
}, },
created() { created() {
const flashErrorMessage = s__( const flashErrorMessage = s__(
'mrWidget|An error occured while retrieving approval data for this merge request.', 'mrWidget|An error occurred while retrieving approval data for this merge request.',
); );
this.service this.service
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
%button.btn.js-settings-toggle{ type: 'button' } %button.btn.js-settings-toggle{ type: 'button' }
= expanded ? 'Collapse' : 'Expand' = expanded ? 'Collapse' : 'Expand'
%p %p
= _('Elasticsearch intergration. Elasticsearch AWS IAM.') = _('Elasticsearch integration. Elasticsearch AWS IAM.')
.settings-content .settings-content
= form_for @application_setting, url: admin_application_settings_path(anchor: 'js-elasticsearch-settings'), html: { class: 'fieldset-form' } do |f| = form_for @application_setting, url: admin_application_settings_path(anchor: 'js-elasticsearch-settings'), html: { class: 'fieldset-form' } do |f|
......
...@@ -8,7 +8,7 @@ class RepositoryUpdateMirrorWorker ...@@ -8,7 +8,7 @@ class RepositoryUpdateMirrorWorker
LEASE_KEY = 'repository_update_mirror_worker_start_scheduler'.freeze LEASE_KEY = 'repository_update_mirror_worker_start_scheduler'.freeze
LEASE_TIMEOUT = 2.seconds LEASE_TIMEOUT = 2.seconds
# Retry not neccessary. It will try again at the next update interval. # Retry not necessary. It will try again at the next update interval.
sidekiq_options retry: false, status_expiration: StuckImportJobsWorker::IMPORT_JOBS_EXPIRATION sidekiq_options retry: false, status_expiration: StuckImportJobsWorker::IMPORT_JOBS_EXPIRATION
attr_accessor :project, :repository, :current_user attr_accessor :project, :repository, :current_user
......
...@@ -80,7 +80,7 @@ module Gitlab ...@@ -80,7 +80,7 @@ module Gitlab
return unless tokens.count == 2 return unless tokens.count == 2
return unless tokens[0] == Gitlab::Geo::BaseRequest::GITLAB_GEO_AUTH_TOKEN_TYPE return unless tokens[0] == Gitlab::Geo::BaseRequest::GITLAB_GEO_AUTH_TOKEN_TYPE
# Split at the first occurence of a colon # Split at the first occurrence of a colon
geo_tokens = tokens[1].split(':', 2) geo_tokens = tokens[1].split(':', 2)
return unless geo_tokens.count == 2 return unless geo_tokens.count == 2
......
...@@ -17,7 +17,7 @@ module OmniAuth ...@@ -17,7 +17,7 @@ module OmniAuth
end end
# Prevent access to SLO and metadata endpoints # Prevent access to SLO and metadata endpoints
# These will need addtional work to securely support # These will need additional work to securely support
def other_phase def other_phase
call_app! call_app!
end end
......
...@@ -239,7 +239,7 @@ describe OperationsController do ...@@ -239,7 +239,7 @@ describe OperationsController do
user.ops_dashboard_projects << project user.ops_dashboard_projects << project
end end
it 'removes a project succesfully' do it 'removes a project successfully' do
delete :destroy, project_id: project.id delete :destroy, project_id: project.id
expect(response).to have_gitlab_http_status(200) expect(response).to have_gitlab_http_status(200)
......
...@@ -62,7 +62,7 @@ describe EE::NamespacesHelper, :postgresql do ...@@ -62,7 +62,7 @@ describe EE::NamespacesHelper, :postgresql do
end end
context 'when DEVELOPER_MAINTAINER_PROJECT_ACCESS is set globally' do context 'when DEVELOPER_MAINTAINER_PROJECT_ACCESS is set globally' do
it 'return groups where default is not overriden' do it 'return groups where default is not overridden' do
allow(helper).to receive(:current_user).and_return(user) allow(helper).to receive(:current_user).and_return(user)
stub_application_setting(default_project_creation: ::EE::Gitlab::Access::DEVELOPER_MAINTAINER_PROJECT_ACCESS) stub_application_setting(default_project_creation: ::EE::Gitlab::Access::DEVELOPER_MAINTAINER_PROJECT_ACCESS)
admin_group.add_user(user, GroupMember::DEVELOPER) admin_group.add_user(user, GroupMember::DEVELOPER)
......
...@@ -16,7 +16,7 @@ describe Gitlab::Ci::Parsers::Security::Sast do ...@@ -16,7 +16,7 @@ describe Gitlab::Ci::Parsers::Security::Sast do
end end
end end
it "parses all identifiers and occurences" do it "parses all identifiers and occurrences" do
expect(report.occurrences.length).to eq(3) expect(report.occurrences.length).to eq(3)
expect(report.identifiers.length).to eq(4) expect(report.identifiers.length).to eq(4)
expect(report.scanners.length).to eq(3) expect(report.scanners.length).to eq(3)
......
...@@ -80,7 +80,7 @@ describe Gitlab::Geo::Oauth::LogoutState do ...@@ -80,7 +80,7 @@ describe Gitlab::Geo::Oauth::LogoutState do
expect(subject.return_to).to be_nil expect(subject.return_to).to be_nil
end end
it 'returns an emtpy string when return_to is empty' do it 'returns an empty string when return_to is empty' do
subject = described_class.new(salt: salt, token: access_token, return_to: '') subject = described_class.new(salt: salt, token: access_token, return_to: '')
expect(subject.return_to).to eq('') expect(subject.return_to).to eq('')
......
...@@ -2953,7 +2953,7 @@ msgstr "" ...@@ -2953,7 +2953,7 @@ msgstr ""
msgid "Elasticsearch" msgid "Elasticsearch"
msgstr "" msgstr ""
msgid "Elasticsearch intergration. Elasticsearch AWS IAM." msgid "Elasticsearch integration. Elasticsearch AWS IAM."
msgstr "" msgstr ""
msgid "Email" msgid "Email"
...@@ -9677,10 +9677,10 @@ msgstr "" ...@@ -9677,10 +9677,10 @@ msgstr ""
msgid "mrWidget|Allows commits from members who can merge to the target branch" msgid "mrWidget|Allows commits from members who can merge to the target branch"
msgstr "" msgstr ""
msgid "mrWidget|An error occured while removing your approval." msgid "mrWidget|An error occurred while removing your approval."
msgstr "" msgstr ""
msgid "mrWidget|An error occured while retrieving approval data for this merge request." msgid "mrWidget|An error occurred while retrieving approval data for this merge request."
msgstr "" msgstr ""
msgid "mrWidget|An error occurred while submitting your approval." msgid "mrWidget|An error occurred while submitting your approval."
......
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