df8f0ab521
This assignment is only used by the Projects::NetworkController, so
we're needlessly assigning this very generically-named instance variable
on every controller which includes `ExtractsPath`, which is quite a few.
Further, the way we were passing this hash to
`HashWithIndifferentAccess` caused the following deprecation warning
after upgrading to Rails 5:
DEPRECATION WARNING: #to_hash unexpectedly ignores parameter
filtering, and will change to enforce it in Rails 5.1. Enable
`raise_on_unfiltered_parameters` to respect parameter filtering,
which is the default in new applications. For the existing
deprecated behaviour, call #to_unsafe_h instead. (called from new at
lib/extracts_path.rb:116)
46 lines
1.2 KiB
Ruby
46 lines
1.2 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class Projects::NetworkController < Projects::ApplicationController
|
|
include ExtractsPath
|
|
include ApplicationHelper
|
|
|
|
before_action :whitelist_query_limiting
|
|
before_action :require_non_empty_project
|
|
before_action :assign_ref_vars
|
|
before_action :authorize_download_code!
|
|
before_action :assign_options
|
|
before_action :assign_commit
|
|
|
|
def show
|
|
@url = project_network_path(@project, @ref, @options.merge(format: :json))
|
|
@commit_url = project_commit_path(@project, 'ae45ca32').gsub("ae45ca32", "%s")
|
|
|
|
respond_to do |format|
|
|
format.html do
|
|
if @options[:extended_sha1] && !@commit
|
|
flash.now[:alert] = "Git revision '#{@options[:extended_sha1]}' does not exist."
|
|
end
|
|
end
|
|
|
|
format.json do
|
|
@graph = Network::Graph.new(project, @ref, @commit, @options[:filter_ref])
|
|
end
|
|
end
|
|
|
|
render
|
|
end
|
|
|
|
def assign_options
|
|
@options = params.permit(:filter_ref, :extended_sha1)
|
|
end
|
|
|
|
def assign_commit
|
|
return if @options[:extended_sha1].blank?
|
|
|
|
@commit = @repo.commit(@options[:extended_sha1])
|
|
end
|
|
|
|
def whitelist_query_limiting
|
|
Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42333')
|
|
end
|
|
end
|