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
b623c85d
Commit
b623c85d
authored
Jan 15, 2020
by
Ryan Cobb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable Rails Rubocop
This enables Rails/SafeNavigationWithBlank and Rails/EnumHash rubocops.
parent
cf4e99d0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
23 deletions
+18
-23
.rubocop.yml
.rubocop.yml
+13
-18
app/models/user.rb
app/models/user.rb
+4
-4
ee/app/services/ee/groups/update_service.rb
ee/app/services/ee/groups/update_service.rb
+1
-1
No files found.
.rubocop.yml
View file @
b623c85d
...
...
@@ -301,24 +301,6 @@ RSpec/AnyInstanceOf:
Enabled
:
false
# Cops for upgrade to gitlab-styles 3.1.0
Rails/SafeNavigationWithBlank
:
Enabled
:
false
Rails/ApplicationController
:
Enabled
:
false
Rails/ApplicationMailer
:
Enabled
:
false
Rails/RakeEnvironment
:
Enabled
:
false
Rails/HelperInstanceVariable
:
Enabled
:
false
Rails/EnumHash
:
Enabled
:
false
RSpec/ReceiveCounts
:
Enabled
:
false
...
...
@@ -369,3 +351,16 @@ Style/MultilineWhenThen:
Style/FloatDivision
:
Enabled
:
false
# Cops that require refactoring
Rails/ApplicationController
:
Enabled
:
false
Rails/ApplicationMailer
:
Enabled
:
false
Rails/RakeEnvironment
:
Enabled
:
false
Rails/HelperInstanceVariable
:
Enabled
:
false
\ No newline at end of file
app/models/user.rb
View file @
b623c85d
...
...
@@ -223,19 +223,19 @@ class User < ApplicationRecord
after_initialize
:set_projects_limit
# User's Layout preference
enum
layout:
[
:fixed
,
:fluid
]
enum
layout:
{
fixed:
0
,
fluid:
1
}
# User's Dashboard preference
# Note: When adding an option, it MUST go on the end of the array.
enum
dashboard:
[
:projects
,
:stars
,
:project_activity
,
:starred_project_activity
,
:groups
,
:todos
,
:issues
,
:merge_requests
,
:operations
]
enum
dashboard:
{
projects:
0
,
stars:
1
,
project_activity:
2
,
starred_project_activity:
3
,
groups:
4
,
todos:
5
,
issues:
6
,
merge_requests:
7
,
operations:
8
}
# User's Project preference
# Note: When adding an option, it MUST go on the end of the array.
enum
project_view:
[
:readme
,
:activity
,
:files
]
enum
project_view:
{
readme:
0
,
activity:
1
,
files:
2
}
# User's role
# Note: When adding an option, it MUST go on the end of the array.
enum
role:
[
:software_developer
,
:development_team_lead
,
:devops_engineer
,
:systems_administrator
,
:security_analyst
,
:data_analyst
,
:product_manager
,
:product_designer
,
:other
]
,
_suffix:
true
enum
role:
{
software_developer:
0
,
development_team_lead:
1
,
devops_engineer:
2
,
systems_administrator:
3
,
security_analyst:
4
,
data_analyst:
5
,
product_manager:
6
,
product_designer:
7
,
other:
8
}
,
_suffix:
true
delegate
:path
,
to: :namespace
,
allow_nil:
true
,
prefix:
true
delegate
:notes_filter_for
,
to: :user_preference
...
...
ee/app/services/ee/groups/update_service.rb
View file @
b623c85d
...
...
@@ -105,7 +105,7 @@ module EE
return
unless
group
.
allowed_email_domain
.
present?
return
unless
allowed_domain_params
if
allowed_domain_params
[
:domain
]
&
.
blank?
if
allowed_domain_params
[
:domain
].
blank?
allowed_domain_params
[
:_destroy
]
=
1
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