diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-09-09 19:31:33 -0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-09-09 19:31:33 -0300 |
| commit | a2c17ce1b3498bdb682482355dc7bc5cb347fea5 (patch) | |
| tree | 0e78f59bfb3ffe87dd13ceb2c163da00def2c414 | |
| parent | 16bb9433f4534f85ac694b8645d13988af5051eb (diff) | |
| download | gitlab-ce-a2c17ce1b3498bdb682482355dc7bc5cb347fea5.tar.gz | |
Make Rubocop happy
| -rw-r--r-- | app/controllers/projects/forks_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/project.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/projects/forks_controller.rb b/app/controllers/projects/forks_controller.rb index aa02b86f537..e11747ce0a3 100644 --- a/app/controllers/projects/forks_controller.rb +++ b/app/controllers/projects/forks_controller.rb @@ -16,7 +16,7 @@ class Projects::ForksController < Projects::ApplicationController @internal_forks_count = @total_forks_count - @public_forks_count - @private_forks_count @forks = ForkProjectsFinder.new(project, params: params.merge(search: params[:filter_projects]), current_user: current_user).execute - @forks = @forks.eager_load_namespace_and_owner.includes(:creator).with_route.page(params[:page]) + @forks = @forks.eager_load_namespace_and_owner.inc_creator.with_route.page(params[:page]) respond_to do |format| format.html diff --git a/app/models/project.rb b/app/models/project.rb index d948410e397..38d8c62f3bb 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -417,6 +417,7 @@ class Project < ApplicationRecord scope :with_merge_requests_available_for_user, ->(current_user) { with_feature_available_for_user(:merge_requests, current_user) } scope :with_merge_requests_enabled, -> { with_feature_enabled(:merge_requests) } scope :with_remote_mirrors, -> { joins(:remote_mirrors).where(remote_mirrors: { enabled: true }).distinct } + scope :inc_creator, -> { includes(:creator) } scope :with_group_runners_enabled, -> do joins(:ci_cd_settings) |