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
e347c4ab
Commit
e347c4ab
authored
Aug 18, 2020
by
Małgorzata Ksionek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix rubocop offences
parent
40c0a390
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
ee/app/controllers/ee/projects/forks_controller.rb
ee/app/controllers/ee/projects/forks_controller.rb
+1
-1
ee/app/models/ee/group.rb
ee/app/models/ee/group.rb
+1
-0
No files found.
ee/app/controllers/ee/projects/forks_controller.rb
View file @
e347c4ab
...
...
@@ -14,7 +14,7 @@ module EE
override
:load_namespaces_with_associations
def
load_namespaces_with_associations
super
.
preload
(
:deletion_schedule
)
super
.
with_deletion_schedule_only
end
end
end
...
...
ee/app/models/ee/group.rb
View file @
e347c4ab
...
...
@@ -69,6 +69,7 @@ module EE
scope
:aimed_for_deletion
,
->
(
date
)
{
joins
(
:deletion_schedule
).
where
(
'group_deletion_schedules.marked_for_deletion_on <= ?'
,
date
)
}
scope
:with_deletion_schedule
,
->
{
preload
(
deletion_schedule: :deleting_user
)
}
scope
:with_deletion_schedule_only
,
->
{
preload
(
:deletion_schedule
)
}
scope
:where_group_links_with_provider
,
->
(
provider
)
do
joins
(
:ldap_group_links
).
where
(
ldap_group_links:
{
provider:
provider
})
...
...
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