Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
609bfba7
Commit
609bfba7
authored
Oct 28, 2021
by
Katrin Leinweber
Committed by
Andy Soiron
Oct 28, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix typo 'commited' in strings & code
See
https://crowdin.com/translate/gitlab-ee/10/en-de#10998
parent
ccb1fcf7
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
7 deletions
+7
-7
app/models/concerns/update_highest_role.rb
app/models/concerns/update_highest_role.rb
+1
-1
ee/lib/api/project_push_rule.rb
ee/lib/api/project_push_rule.rb
+1
-1
scripts/regenerate-schema
scripts/regenerate-schema
+2
-2
spec/frontend/ide/stores/mutations_spec.js
spec/frontend/ide/stores/mutations_spec.js
+2
-2
spec/frontend/monitoring/components/dashboard_spec.js
spec/frontend/monitoring/components/dashboard_spec.js
+1
-1
No files found.
app/models/concerns/update_highest_role.rb
View file @
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 commit
t
ed 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
...
...
ee/lib/api/project_push_rule.rb
View file @
609bfba7
...
@@ -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 commit
t
ed 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'
...
...
scripts/regenerate-schema
View file @
609bfba7
...
@@ -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
+
commit
t
ed_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
commit
t
ed_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
...
...
spec/frontend/ide/stores/mutations_spec.js
View file @
609bfba7
...
@@ -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
:
'
commit
t
ed
'
,
});
});
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
(
'
commit
t
ed
'
);
});
});
});
});
...
...
spec/frontend/monitoring/components/dashboard_spec.js
View file @
609bfba7
...
@@ -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 commit
t
ed by the store
'
,
()
=>
{
beforeEach
(()
=>
{
beforeEach
(()
=>
{
store
.
commit
(
`monitoringDashboard/
${
types
.
SET_INITIAL_STATE
}
`
,
{
store
.
commit
(
`monitoringDashboard/
${
types
.
SET_INITIAL_STATE
}
`
,
{
currentEnvironmentName
:
'
production
'
,
currentEnvironmentName
:
'
production
'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment