diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-02-22 16:50:15 -0600 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-02-23 09:33:05 -0600 |
| commit | 1fe7501b49f896b74102c4b970310aa9ae34da85 (patch) | |
| tree | ce271afb0fbaaa14291c1dc9009cd7815ee25463 /app/finders | |
| parent | bdbc7d967a0c3d95d5e4ea19a2a5be41268d3540 (diff) | |
| download | gitlab-ce-1fe7501b49f896b74102c4b970310aa9ae34da85.tar.gz | |
Revert "Prefer leading style for Style/DotPosition"
This reverts commit cb10b725c8929b8b4460f89c9d96c773af39ba6b.
Diffstat (limited to 'app/finders')
| -rw-r--r-- | app/finders/environments_finder.rb | 10 | ||||
| -rw-r--r-- | app/finders/group_members_finder.rb | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/app/finders/environments_finder.rb b/app/finders/environments_finder.rb index a59f8c1efa3..52c73abc31d 100644 --- a/app/finders/environments_finder.rb +++ b/app/finders/environments_finder.rb @@ -17,12 +17,12 @@ class EnvironmentsFinder deployments.none end - environment_ids = deployments - .group(:environment_id) - .select(:environment_id) + environment_ids = deployments. + group(:environment_id). + select(:environment_id) - environments = project.environments.available - .where(id: environment_ids).order_by_last_deployed_at.to_a + environments = project.environments.available. + where(id: environment_ids).order_by_last_deployed_at.to_a environments.select! do |environment| Ability.allowed?(current_user, :read_environment, environment) diff --git a/app/finders/group_members_finder.rb b/app/finders/group_members_finder.rb index 873a253e2b5..9f2206346ce 100644 --- a/app/finders/group_members_finder.rb +++ b/app/finders/group_members_finder.rb @@ -8,9 +8,9 @@ class GroupMembersFinder < Projects::ApplicationController return group_members unless @group.parent - parents_members = GroupMember.non_request - .where(source_id: @group.ancestors.select(:id)) - .where.not(user_id: @group.users.select(:id)) + parents_members = GroupMember.non_request. + where(source_id: @group.ancestors.select(:id)). + where.not(user_id: @group.users.select(:id)) wheres = ["members.id IN (#{group_members.select(:id).to_sql})"] wheres << "members.id IN (#{parents_members.select(:id).to_sql})" |