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
7495242e
Commit
7495242e
authored
Jul 07, 2020
by
Gary Holtz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correcting several instances of 'overridden' being misspelled
parent
0996a29f
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
15 additions
and
15 deletions
+15
-15
app/helpers/search_helper.rb
app/helpers/search_helper.rb
+1
-1
app/models/concerns/has_repository.rb
app/models/concerns/has_repository.rb
+1
-1
app/presenters/clusterable_presenter.rb
app/presenters/clusterable_presenter.rb
+1
-1
app/services/users/block_service.rb
app/services/users/block_service.rb
+1
-1
ee/app/finders/merge_requests/by_approvers_finder.rb
ee/app/finders/merge_requests/by_approvers_finder.rb
+3
-3
ee/lib/gitlab/geo/log_helpers.rb
ee/lib/gitlab/geo/log_helpers.rb
+1
-1
lib/gitlab/ci/config.rb
lib/gitlab/ci/config.rb
+1
-1
lib/gitlab/file_finder.rb
lib/gitlab/file_finder.rb
+1
-1
spec/frontend/monitoring/components/dashboard_panel_spec.js
spec/frontend/monitoring/components/dashboard_panel_spec.js
+1
-1
spec/lib/gitlab/lograge/custom_options_spec.rb
spec/lib/gitlab/lograge/custom_options_spec.rb
+2
-2
spec/models/concerns/reactive_caching_spec.rb
spec/models/concerns/reactive_caching_spec.rb
+1
-1
spec/models/personal_access_token_spec.rb
spec/models/personal_access_token_spec.rb
+1
-1
No files found.
app/helpers/search_helper.rb
View file @
7495242e
...
@@ -62,7 +62,7 @@ module SearchHelper
...
@@ -62,7 +62,7 @@ module SearchHelper
}).
html_safe
}).
html_safe
end
end
# Overriden in EE
# Overrid
d
en in EE
def
search_blob_title
(
project
,
path
)
def
search_blob_title
(
project
,
path
)
path
path
end
end
...
...
app/models/concerns/has_repository.rb
View file @
7495242e
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
# of directly having a repository, like project or snippet.
# of directly having a repository, like project or snippet.
#
#
# It also includes `Referable`, therefore the method
# It also includes `Referable`, therefore the method
# `to_reference` should be overriden in case the object
# `to_reference` should be overrid
d
en in case the object
# needs any special behavior.
# needs any special behavior.
module
HasRepository
module
HasRepository
extend
ActiveSupport
::
Concern
extend
ActiveSupport
::
Concern
...
...
app/presenters/clusterable_presenter.rb
View file @
7495242e
...
@@ -65,7 +65,7 @@ class ClusterablePresenter < Gitlab::View::Presenter::Delegated
...
@@ -65,7 +65,7 @@ class ClusterablePresenter < Gitlab::View::Presenter::Delegated
raise
NotImplementedError
raise
NotImplementedError
end
end
# Will be overidden in EE
# Will be over
r
idden in EE
def
environments_cluster_path
(
cluster
)
def
environments_cluster_path
(
cluster
)
nil
nil
end
end
...
...
app/services/users/block_service.rb
View file @
7495242e
...
@@ -19,7 +19,7 @@ module Users
...
@@ -19,7 +19,7 @@ module Users
private
private
def
after_block_hook
(
user
)
def
after_block_hook
(
user
)
# overriden by EE module
# overrid
d
en by EE module
end
end
end
end
end
end
...
...
ee/app/finders/merge_requests/by_approvers_finder.rb
View file @
7495242e
...
@@ -80,9 +80,9 @@ module MergeRequests
...
@@ -80,9 +80,9 @@ module MergeRequests
users_mrs
=
yield
(
items
.
joins
(
approval_rules: :users
))
users_mrs
=
yield
(
items
.
joins
(
approval_rules: :users
))
group_users_mrs
=
yield
(
items
.
joins
(
approval_rules:
{
groups: :users
}))
group_users_mrs
=
yield
(
items
.
joins
(
approval_rules:
{
groups: :users
}))
mrs_without_overriden_rules
=
items
.
left_outer_joins
(
:approval_rules
).
where
(
approval_merge_request_rules:
{
id:
nil
})
mrs_without_overrid
d
en_rules
=
items
.
left_outer_joins
(
:approval_rules
).
where
(
approval_merge_request_rules:
{
id:
nil
})
project_users_mrs
=
yield
(
mrs_without_overriden_rules
.
joins
(
target_project:
{
approval_rules: :users
}))
project_users_mrs
=
yield
(
mrs_without_overrid
d
en_rules
.
joins
(
target_project:
{
approval_rules: :users
}))
project_group_users_mrs
=
yield
(
mrs_without_overriden_rules
.
joins
(
target_project:
{
approval_rules:
{
groups: :users
}
}))
project_group_users_mrs
=
yield
(
mrs_without_overrid
d
en_rules
.
joins
(
target_project:
{
approval_rules:
{
groups: :users
}
}))
items
.
select_from_union
([
users_mrs
,
group_users_mrs
,
project_users_mrs
,
project_group_users_mrs
])
items
.
select_from_union
([
users_mrs
,
group_users_mrs
,
project_users_mrs
,
project_group_users_mrs
])
end
end
...
...
ee/lib/gitlab/geo/log_helpers.rb
View file @
7495242e
...
@@ -29,7 +29,7 @@ module Gitlab
...
@@ -29,7 +29,7 @@ module Gitlab
}.
merge
(
extra_log_data
).
compact
}.
merge
(
extra_log_data
).
compact
end
end
# Intended to be overidden elsewhere
# Intended to be over
r
idden elsewhere
def
extra_log_data
def
extra_log_data
{}
{}
end
end
...
...
lib/gitlab/ci/config.rb
View file @
7495242e
...
@@ -93,7 +93,7 @@ module Gitlab
...
@@ -93,7 +93,7 @@ module Gitlab
Gitlab
::
ErrorTracking
.
track_and_raise_for_dev_exception
(
error
,
@context
.
sentry_payload
)
Gitlab
::
ErrorTracking
.
track_and_raise_for_dev_exception
(
error
,
@context
.
sentry_payload
)
end
end
# Overriden in EE
# Overrid
d
en in EE
def
rescue_errors
def
rescue_errors
RESCUE_ERRORS
RESCUE_ERRORS
end
end
...
...
lib/gitlab/file_finder.rb
View file @
7495242e
...
@@ -42,7 +42,7 @@ module Gitlab
...
@@ -42,7 +42,7 @@ module Gitlab
end
end
end
end
# Overriden in Gitlab::WikiFileFinder
# Overrid
d
en in Gitlab::WikiFileFinder
def
search_paths
(
query
)
def
search_paths
(
query
)
repository
.
search_files_by_name
(
query
,
ref
)
repository
.
search_files_by_name
(
query
,
ref
)
end
end
...
...
spec/frontend/monitoring/components/dashboard_panel_spec.js
View file @
7495242e
...
@@ -369,7 +369,7 @@ describe('Dashboard Panel', () => {
...
@@ -369,7 +369,7 @@ describe('Dashboard Panel', () => {
});
});
});
});
it
(
'
it is overriden when a datazoom event is received
'
,
()
=>
{
it
(
'
it is overrid
d
en when a datazoom event is received
'
,
()
=>
{
state
.
logsPath
=
mockLogsPath
;
state
.
logsPath
=
mockLogsPath
;
state
.
timeRange
=
mockTimeRange
;
state
.
timeRange
=
mockTimeRange
;
...
...
spec/lib/gitlab/lograge/custom_options_spec.rb
View file @
7495242e
...
@@ -65,14 +65,14 @@ RSpec.describe Gitlab::Lograge::CustomOptions do
...
@@ -65,14 +65,14 @@ RSpec.describe Gitlab::Lograge::CustomOptions do
end
end
end
end
context
'when correlation_id is overriden'
do
context
'when correlation_id is overrid
d
en'
do
let
(
:correlation_id_key
)
{
Labkit
::
Correlation
::
CorrelationId
::
LOG_KEY
}
let
(
:correlation_id_key
)
{
Labkit
::
Correlation
::
CorrelationId
::
LOG_KEY
}
before
do
before
do
event_payload
[
correlation_id_key
]
=
'123456'
event_payload
[
correlation_id_key
]
=
'123456'
end
end
it
'sets the overriden value'
do
it
'sets the overrid
d
en value'
do
expect
(
subject
[
correlation_id_key
]).
to
eq
(
'123456'
)
expect
(
subject
[
correlation_id_key
]).
to
eq
(
'123456'
)
end
end
end
end
...
...
spec/models/concerns/reactive_caching_spec.rb
View file @
7495242e
...
@@ -298,7 +298,7 @@ RSpec.describe ReactiveCaching, :use_clean_rails_memory_store_caching do
...
@@ -298,7 +298,7 @@ RSpec.describe ReactiveCaching, :use_clean_rails_memory_store_caching do
expect
(
read_reactive_cache
(
instance
)).
not_to
eq
(
calculation
.
call
)
expect
(
read_reactive_cache
(
instance
)).
not_to
eq
(
calculation
.
call
)
end
end
context
'when reactive_cache_limit_enabled? is overriden to return false'
do
context
'when reactive_cache_limit_enabled? is overrid
d
en to return false'
do
before
do
before
do
allow
(
instance
).
to
receive
(
:reactive_cache_limit_enabled?
).
and_return
(
false
)
allow
(
instance
).
to
receive
(
:reactive_cache_limit_enabled?
).
and_return
(
false
)
end
end
...
...
spec/models/personal_access_token_spec.rb
View file @
7495242e
...
@@ -204,7 +204,7 @@ RSpec.describe PersonalAccessToken do
...
@@ -204,7 +204,7 @@ RSpec.describe PersonalAccessToken do
end
end
describe
'.simple_sorts'
do
describe
'.simple_sorts'
do
it
'includes overriden keys'
do
it
'includes overrid
d
en keys'
do
expect
(
described_class
.
simple_sorts
.
keys
).
to
include
(
*
%w(expires_at_asc expires_at_desc)
)
expect
(
described_class
.
simple_sorts
.
keys
).
to
include
(
*
%w(expires_at_asc expires_at_desc)
)
end
end
end
end
...
...
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