Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeinrich Lee Yu <heinrich@gitlab.com>2019-05-13 07:42:06 +0300
committerHeinrich Lee Yu <heinrich@gitlab.com>2019-05-13 07:42:06 +0300
commiteb88ca76469539431b7f06592f177a77d5738612 (patch)
treeacfef46fb6d3c3313fa152ece9240ef3570a2ce8 /app/services
parent74511b049743cf543694bb92a8acd7e7586e533d (diff)
Rename methods that conflict in Rails 5.2
Adds suffix to enum methods and changes `in_groups` to `of_groups`
Diffstat (limited to 'app/services')
-rw-r--r--app/services/concerns/users/participable_service.rb2
-rw-r--r--app/services/members/destroy_service.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/services/concerns/users/participable_service.rb b/app/services/concerns/users/participable_service.rb
index a3cc6014fd3..1c828234f1b 100644
--- a/app/services/concerns/users/participable_service.rb
+++ b/app/services/concerns/users/participable_service.rb
@@ -29,7 +29,7 @@ module Users
def groups
group_counts = GroupMember
- .in_groups(current_user.authorized_groups)
+ .of_groups(current_user.authorized_groups)
.non_request
.count_users_by_group_id
diff --git a/app/services/members/destroy_service.rb b/app/services/members/destroy_service.rb
index f9717a9426b..c8d5e563cd8 100644
--- a/app/services/members/destroy_service.rb
+++ b/app/services/members/destroy_service.rb
@@ -45,7 +45,7 @@ module Members
def delete_subgroup_members(member)
groups = member.group.descendants
- GroupMember.in_groups(groups).with_user(member.user).each do |group_member|
+ GroupMember.of_groups(groups).with_user(member.user).each do |group_member|
self.class.new(current_user).execute(group_member, skip_authorization: @skip_auth, skip_subresources: true)
end
end