Merge branch 'gt-fix-typos-in-specs-and-js' into 'master'

Fix typos in specs and js

See merge request gitlab-org/gitlab-ee!8455

ee/app/assets/javascripts/protected_environments/protected_environment_create.js

@@ -66,7 +66,7 @@ export default class ProtectedEnvironmentCreate {
         callback(results);
       })
       .catch(() => {
-        Flash('An error occured while fetching environments.');
+        Flash('An error occurred while fetching environments.');
         callback([]);
       });
   }

ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals_footer.vue

@@ -73,7 +73,7 @@ export default {
         })
         .catch(() => {
           this.unapproving = false;
-          Flash(s__('mrWidget|An error occured while removing your approval.'));
+          Flash(s__('mrWidget|An error occurred while removing your approval.'));
         });
     },
   },

ee/app/assets/javascripts/vue_merge_request_widget/components/approvals/mr_widget_approvals.vue

@@ -45,7 +45,7 @@ export default {
   },
   created() {
     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

ee/app/workers/repository_update_mirror_worker.rb

@@ -8,7 +8,7 @@ class RepositoryUpdateMirrorWorker
   LEASE_KEY = 'repository_update_mirror_worker_start_scheduler'.freeze
   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
 
   attr_accessor :project, :repository, :current_user

ee/lib/gitlab/geo/jwt_request_decoder.rb

@@ -80,7 +80,7 @@ module Gitlab
         return unless tokens.count == 2
         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)
 
         return unless geo_tokens.count == 2

ee/lib/omni_auth/strategies/group_saml.rb

@@ -17,7 +17,7 @@ module OmniAuth
       end
 
       # 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
         call_app!
       end

ee/spec/controllers/operations_controller_spec.rb

@@ -239,7 +239,7 @@ describe OperationsController do
         user.ops_dashboard_projects << project
       end
 
-      it 'removes a project succesfully' do
+      it 'removes a project successfully' do
         delete :destroy, project_id: project.id
 
         expect(response).to have_gitlab_http_status(200)

ee/spec/helpers/ee/namespaces_helper_spec.rb

@@ -62,7 +62,7 @@ describe EE::NamespacesHelper, :postgresql do
       end
 
       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)
           stub_application_setting(default_project_creation: ::EE::Gitlab::Access::DEVELOPER_MAINTAINER_PROJECT_ACCESS)
           admin_group.add_user(user, GroupMember::DEVELOPER)

ee/spec/lib/gitlab/ci/parsers/security/sast_spec.rb

@@ -16,7 +16,7 @@ describe Gitlab::Ci::Parsers::Security::Sast do
       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.identifiers.length).to eq(4)
       expect(report.scanners.length).to eq(3)

ee/spec/lib/gitlab/geo/oauth/logout_state_spec.rb

@@ -80,7 +80,7 @@ describe Gitlab::Geo::Oauth::LogoutState do
       expect(subject.return_to).to be_nil
     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: '')
 
       expect(subject.return_to).to eq('')

locale/gitlab.pot

@@ -9689,10 +9689,10 @@ msgstr ""
 msgid "mrWidget|Allows commits from members who can merge to the target branch"
 msgstr ""
 
-msgid "mrWidget|An error occured while removing your approval."
+msgid "mrWidget|An error occurred while removing your approval."
 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 ""
 
 msgid "mrWidget|An error occurred while submitting your approval."