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
d3d94c2d
Commit
d3d94c2d
authored
Mar 17, 2021
by
Shubham Kumar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed rubocop offense Layout/RescueEnsureAlignment
Resolves autocorrect rubocop offense
parent
741400a0
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
18 additions
and
27 deletions
+18
-27
.rubocop_todo.yml
.rubocop_todo.yml
+0
-14
app/models/blob_viewer/dependency_manager.rb
app/models/blob_viewer/dependency_manager.rb
+2
-2
app/models/project.rb
app/models/project.rb
+2
-2
app/services/prometheus/proxy_service.rb
app/services/prometheus/proxy_service.rb
+2
-2
app/workers/delete_stored_files_worker.rb
app/workers/delete_stored_files_worker.rb
+2
-2
changelogs/unreleased/pl-rubocop-todo-rescue-ensure-alignment.yml
...gs/unreleased/pl-rubocop-todo-rescue-ensure-alignment.yml
+5
-0
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+2
-2
config/initializers/trusted_proxies.rb
config/initializers/trusted_proxies.rb
+1
-1
lib/gitlab/highlight.rb
lib/gitlab/highlight.rb
+2
-2
No files found.
.rubocop_todo.yml
View file @
d3d94c2d
...
...
@@ -76,20 +76,6 @@ Layout/LineLength:
Layout/MultilineOperationIndentation
:
Enabled
:
false
# Offense count: 11
# Cop supports --auto-correct.
Layout/RescueEnsureAlignment
:
Exclude
:
-
'
app/models/blob_viewer/dependency_manager.rb'
-
'
app/models/project.rb'
-
'
app/services/prometheus/proxy_service.rb'
-
'
app/workers/concerns/reactive_cacheable_worker.rb'
-
'
app/workers/delete_stored_files_worker.rb'
-
'
config/initializers/1_settings.rb'
-
'
config/initializers/trusted_proxies.rb'
-
'
lib/api/internal/base.rb'
-
'
lib/gitlab/highlight.rb'
# Offense count: 53
# Cop supports --auto-correct.
Layout/SpaceAroundMethodCallOperator
:
...
...
app/models/blob_viewer/dependency_manager.rb
View file @
d3d94c2d
...
...
@@ -33,8 +33,8 @@ module BlobViewer
@json_data
||=
begin
prepare!
Gitlab
::
Json
.
parse
(
blob
.
data
)
rescue
{}
rescue
{}
end
end
...
...
app/models/project.rb
View file @
d3d94c2d
...
...
@@ -2147,8 +2147,8 @@ class Project < ApplicationRecord
data
=
repository
.
route_map_for
(
sha
)
Gitlab
::
RouteMap
.
new
(
data
)
if
data
rescue
Gitlab
::
RouteMap
::
FormatError
nil
rescue
Gitlab
::
RouteMap
::
FormatError
nil
end
end
...
...
app/services/prometheus/proxy_service.rb
View file @
d3d94c2d
...
...
@@ -44,8 +44,8 @@ module Prometheus
def
self
.
from_cache
(
proxyable_class_name
,
proxyable_id
,
method
,
path
,
params
)
proxyable_class
=
begin
proxyable_class_name
.
constantize
rescue
NameError
nil
rescue
NameError
nil
end
return
unless
proxyable_class
...
...
app/workers/delete_stored_files_worker.rb
View file @
d3d94c2d
...
...
@@ -9,8 +9,8 @@ class DeleteStoredFilesWorker # rubocop:disable Scalability/IdempotentWorker
def
perform
(
class_name
,
keys
)
klass
=
begin
class_name
.
constantize
rescue
NameError
nil
rescue
NameError
nil
end
unless
klass
...
...
changelogs/unreleased/pl-rubocop-todo-rescue-ensure-alignment.yml
0 → 100644
View file @
d3d94c2d
---
title
:
Fix offense Layout/RescueEnsureAlignment
merge_request
:
56870
author
:
Shubham Kumar (@imskr)
type
:
fixed
config/initializers/1_settings.rb
View file @
d3d94c2d
...
...
@@ -184,8 +184,8 @@ Settings.gitlab['user'] ||= 'git'
Settings
.
gitlab
[
'ssh_user'
]
||=
Settings
.
gitlab
.
user
Settings
.
gitlab
[
'user_home'
]
||=
begin
Etc
.
getpwnam
(
Settings
.
gitlab
[
'user'
]).
dir
rescue
ArgumentError
# no user configured
'/home/'
+
Settings
.
gitlab
[
'user'
]
rescue
ArgumentError
# no user configured
'/home/'
+
Settings
.
gitlab
[
'user'
]
end
Settings
.
gitlab
[
'time_zone'
]
||=
nil
Settings
.
gitlab
[
'signup_enabled'
]
||=
true
if
Settings
.
gitlab
[
'signup_enabled'
].
nil?
...
...
config/initializers/trusted_proxies.rb
View file @
d3d94c2d
...
...
@@ -17,7 +17,7 @@ end
gitlab_trusted_proxies
=
Array
(
Gitlab
.
config
.
gitlab
.
trusted_proxies
).
map
do
|
proxy
|
IPAddr
.
new
(
proxy
)
rescue
IPAddr
::
InvalidAddressError
rescue
IPAddr
::
InvalidAddressError
end
.
compact
Rails
.
application
.
config
.
action_dispatch
.
trusted_proxies
=
(
...
...
lib/gitlab/highlight.rb
View file @
d3d94c2d
...
...
@@ -33,8 +33,8 @@ module Gitlab
def
lexer
@lexer
||=
custom_language
||
begin
Rouge
::
Lexer
.
guess
(
filename:
@blob_name
,
source:
@blob_content
).
new
rescue
Rouge
::
Guesser
::
Ambiguous
=>
e
e
.
alternatives
.
min_by
(
&
:tag
)
rescue
Rouge
::
Guesser
::
Ambiguous
=>
e
e
.
alternatives
.
min_by
(
&
:tag
)
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