Commit b9625fa9 authored by Andy Soiron's avatar Andy Soiron

Merge branch 'fix-typos-before-translation' into 'master'

Fix typo 'commited' in strings & code

See merge request gitlab-org/gitlab!71128
parents eff83fc9 609bfba7
...@@ -15,7 +15,7 @@ module UpdateHighestRole ...@@ -15,7 +15,7 @@ module UpdateHighestRole
# Schedule a Sidekiq job to update the highest role for a User # Schedule a Sidekiq job to update the highest role for a User
# #
# The job will be called outside of a transaction in order to ensure the changes # The job will be called outside of a transaction in order to ensure the changes
# to be commited before attempting to update the highest role. # to be committed before attempting to update the highest role.
# The exlusive lease will not be released after completion to prevent multiple jobs # The exlusive lease will not be released after completion to prevent multiple jobs
# being executed during the defined timeout. # being executed during the defined timeout.
def update_highest_role def update_highest_role
......
...@@ -39,7 +39,7 @@ module API ...@@ -39,7 +39,7 @@ module API
optional :commit_message_negative_regex, type: String, desc: 'No commit message is allowed to match this' optional :commit_message_negative_regex, type: String, desc: 'No commit message is allowed to match this'
optional :branch_name_regex, type: String, desc: 'All branches names must match this' optional :branch_name_regex, type: String, desc: 'All branches names must match this'
optional :author_email_regex, type: String, desc: 'All commit author emails must match this' optional :author_email_regex, type: String, desc: 'All commit author emails must match this'
optional :file_name_regex, type: String, desc: 'All commited filenames must not match this' optional :file_name_regex, type: String, desc: 'All committed filenames must not match this'
optional :max_file_size, type: Integer, desc: 'Maximum file size (MB)' optional :max_file_size, type: Integer, desc: 'Maximum file size (MB)'
optional :commit_committer_check, type: Boolean, desc: 'Users may only push their own commits' optional :commit_committer_check, type: Boolean, desc: 'Users may only push their own commits'
optional :reject_unsigned_commits, type: Boolean, desc: 'Only GPG signed commits can be pushed to this project' optional :reject_unsigned_commits, type: Boolean, desc: 'Only GPG signed commits can be pushed to this project'
......
...@@ -126,7 +126,7 @@ class SchemaRegenerator ...@@ -126,7 +126,7 @@ class SchemaRegenerator
# In order to properly reset the database and re-run migrations # In order to properly reset the database and re-run migrations
# the schema migrations for new migrations must be removed. # the schema migrations for new migrations must be removed.
def remove_schema_migration_files def remove_schema_migration_files
(untracked_schema_migrations + commited_schema_migrations).each do |schema_migration| (untracked_schema_migrations + committed_schema_migrations).each do |schema_migration|
FileUtils.rm(schema_migration) FileUtils.rm(schema_migration)
end end
end end
...@@ -144,7 +144,7 @@ class SchemaRegenerator ...@@ -144,7 +144,7 @@ class SchemaRegenerator
# List of untracked schema migrations # List of untracked schema migrations
# #
# Get a list of schema migrations that have been committed since the last # Get a list of schema migrations that have been committed since the last
def commited_schema_migrations def committed_schema_migrations
git_command = "git diff --name-only --diff-filter=A #{merge_base} -- #{SCHEMA_MIGRATIONS_DIR}" git_command = "git diff --name-only --diff-filter=A #{merge_base} -- #{SCHEMA_MIGRATIONS_DIR}"
run(git_command).chomp.split("\n") run(git_command).chomp.split("\n")
end end
......
...@@ -86,12 +86,12 @@ describe('Multi-file store mutations', () => { ...@@ -86,12 +86,12 @@ describe('Multi-file store mutations', () => {
mutations.SET_EMPTY_STATE_SVGS(localState, { mutations.SET_EMPTY_STATE_SVGS(localState, {
emptyStateSvgPath: 'emptyState', emptyStateSvgPath: 'emptyState',
noChangesStateSvgPath: 'noChanges', noChangesStateSvgPath: 'noChanges',
committedStateSvgPath: 'commited', committedStateSvgPath: 'committed',
}); });
expect(localState.emptyStateSvgPath).toBe('emptyState'); expect(localState.emptyStateSvgPath).toBe('emptyState');
expect(localState.noChangesStateSvgPath).toBe('noChanges'); expect(localState.noChangesStateSvgPath).toBe('noChanges');
expect(localState.committedStateSvgPath).toBe('commited'); expect(localState.committedStateSvgPath).toBe('committed');
}); });
}); });
......
...@@ -408,7 +408,7 @@ describe('Dashboard', () => { ...@@ -408,7 +408,7 @@ describe('Dashboard', () => {
}); });
}); });
describe('when all requests have been commited by the store', () => { describe('when all requests have been committed by the store', () => {
beforeEach(() => { beforeEach(() => {
store.commit(`monitoringDashboard/${types.SET_INITIAL_STATE}`, { store.commit(`monitoringDashboard/${types.SET_INITIAL_STATE}`, {
currentEnvironmentName: 'production', currentEnvironmentName: 'production',
......
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