diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-19 21:09:27 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-19 21:09:27 +0000 |
commit | c9bef85d79791d41292d2f0727eb362034ebba1e (patch) | |
tree | cb35ec5eb6a83c5d311c8b61ea213450972d8026 /app/finders | |
parent | 6463521e08b00e62d3c877aefd8517f5387d54ab (diff) | |
download | gitlab-ce-c9bef85d79791d41292d2f0727eb362034ebba1e.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/finders')
-rw-r--r-- | app/finders/ci/variables_finder.rb | 3 | ||||
-rw-r--r-- | app/finders/environments_by_deployments_finder.rb | 4 | ||||
-rw-r--r-- | app/finders/environments_finder.rb | 4 | ||||
-rw-r--r-- | app/finders/metrics/dashboards/annotations_finder.rb | 3 | ||||
-rw-r--r-- | app/finders/metrics/users_starred_dashboards_finder.rb | 4 | ||||
-rw-r--r-- | app/finders/packages/debian/distributions_finder.rb | 3 |
6 files changed, 15 insertions, 6 deletions
diff --git a/app/finders/ci/variables_finder.rb b/app/finders/ci/variables_finder.rb index d1546b27995..39a1a60596d 100644 --- a/app/finders/ci/variables_finder.rb +++ b/app/finders/ci/variables_finder.rb @@ -3,7 +3,8 @@ module Ci class VariablesFinder def initialize(resource, params) - @resource, @params = resource, params + @resource = resource + @params = params raise ArgumentError, 'Please provide params[:key]' if params[:key].blank? end diff --git a/app/finders/environments_by_deployments_finder.rb b/app/finders/environments_by_deployments_finder.rb index 7c0fb4c5424..76e1c050ea5 100644 --- a/app/finders/environments_by_deployments_finder.rb +++ b/app/finders/environments_by_deployments_finder.rb @@ -4,7 +4,9 @@ class EnvironmentsByDeploymentsFinder attr_reader :project, :current_user, :params def initialize(project, current_user, params = {}) - @project, @current_user, @params = project, current_user, params + @project = project + @current_user = current_user + @params = params end # rubocop: disable CodeReuse/ActiveRecord diff --git a/app/finders/environments_finder.rb b/app/finders/environments_finder.rb index 688c241dfb2..c64e850f440 100644 --- a/app/finders/environments_finder.rb +++ b/app/finders/environments_finder.rb @@ -6,7 +6,9 @@ class EnvironmentsFinder InvalidStatesError = Class.new(StandardError) def initialize(project, current_user, params = {}) - @project, @current_user, @params = project, current_user, params + @project = project + @current_user = current_user + @params = params end def execute diff --git a/app/finders/metrics/dashboards/annotations_finder.rb b/app/finders/metrics/dashboards/annotations_finder.rb index c42b8bf40e5..e97704738ea 100644 --- a/app/finders/metrics/dashboards/annotations_finder.rb +++ b/app/finders/metrics/dashboards/annotations_finder.rb @@ -4,7 +4,8 @@ module Metrics module Dashboards class AnnotationsFinder def initialize(dashboard:, params:) - @dashboard, @params = dashboard, params + @dashboard = dashboard + @params = params end def execute diff --git a/app/finders/metrics/users_starred_dashboards_finder.rb b/app/finders/metrics/users_starred_dashboards_finder.rb index 7244c51f9a7..2ef706c1b11 100644 --- a/app/finders/metrics/users_starred_dashboards_finder.rb +++ b/app/finders/metrics/users_starred_dashboards_finder.rb @@ -3,7 +3,9 @@ module Metrics class UsersStarredDashboardsFinder def initialize(user:, project:, params: {}) - @user, @project, @params = user, project, params + @user = user + @project = project + @params = params end def execute diff --git a/app/finders/packages/debian/distributions_finder.rb b/app/finders/packages/debian/distributions_finder.rb index 98afc918fb1..a5ac9f7e2f7 100644 --- a/app/finders/packages/debian/distributions_finder.rb +++ b/app/finders/packages/debian/distributions_finder.rb @@ -4,7 +4,8 @@ module Packages module Debian class DistributionsFinder def initialize(container, params = {}) - @container, @params = container, params + @container = container + @params = params end def execute |