Commit d8cc8d7a authored by Hiroyuki Sato's avatar Hiroyuki Sato

Remove 'extended_sha1' option from ExtractsPath module

parent d02f7d29
...@@ -9,6 +9,7 @@ class Projects::NetworkController < Projects::ApplicationController ...@@ -9,6 +9,7 @@ class Projects::NetworkController < Projects::ApplicationController
def show def show
@url = namespace_project_network_path(@project.namespace, @project, @ref, @options.merge(format: :json)) @url = namespace_project_network_path(@project.namespace, @project, @ref, @options.merge(format: :json))
@commit_url = namespace_project_commit_path(@project.namespace, @project, 'ae45ca32').gsub("ae45ca32", "%s") @commit_url = namespace_project_commit_path(@project.namespace, @project, 'ae45ca32').gsub("ae45ca32", "%s")
@commit = @repo.commit(params[:extended_sha1]) if params[:extended_sha1].present?
respond_to do |format| respond_to do |format|
format.html do format.html do
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
.project-network .project-network
.controls .controls
= form_tag namespace_project_network_path(@project.namespace, @project, @id), method: :get, class: 'form-inline network-form' do |f| = form_tag namespace_project_network_path(@project.namespace, @project, @id), method: :get, class: 'form-inline network-form' do |f|
= text_field_tag :extended_sha1, @options[:extended_sha1], placeholder: "Git revision", class: 'search-input form-control input-mx-250 search-sha' = text_field_tag :extended_sha1, params[:extended_sha1], placeholder: "Git revision", class: 'search-input form-control input-mx-250 search-sha'
= button_tag class: 'btn btn-success' do = button_tag class: 'btn btn-success' do
= icon('search') = icon('search')
.inline.prepend-left-20 .inline.prepend-left-20
......
...@@ -106,7 +106,7 @@ module ExtractsPath ...@@ -106,7 +106,7 @@ module ExtractsPath
# resolved (e.g., when a user inserts an invalid path or ref). # resolved (e.g., when a user inserts an invalid path or ref).
def assign_ref_vars def assign_ref_vars
# assign allowed options # assign allowed options
allowed_options = ["filter_ref", "extended_sha1"] allowed_options = ["filter_ref"]
@options = params.select {|key, value| allowed_options.include?(key) && !value.blank? } @options = params.select {|key, value| allowed_options.include?(key) && !value.blank? }
@options = HashWithIndifferentAccess.new(@options) @options = HashWithIndifferentAccess.new(@options)
...@@ -114,9 +114,6 @@ module ExtractsPath ...@@ -114,9 +114,6 @@ module ExtractsPath
@ref, @path = extract_ref(@id) @ref, @path = extract_ref(@id)
@repo = @project.repository @repo = @project.repository
if @options[:extended_sha1].present?
@commit = @repo.commit(@options[:extended_sha1])
else
@commit = @repo.commit(@ref) @commit = @repo.commit(@ref)
if @path.empty? && !@commit && @id.ends_with?('.atom') if @path.empty? && !@commit && @id.ends_with?('.atom')
...@@ -127,7 +124,6 @@ module ExtractsPath ...@@ -127,7 +124,6 @@ module ExtractsPath
end end
raise InvalidPathError unless @commit raise InvalidPathError unless @commit
end
@hex_path = Digest::SHA1.hexdigest(@path) @hex_path = Digest::SHA1.hexdigest(@path)
@logs_path = logs_file_namespace_project_ref_path(@project.namespace, @logs_path = logs_file_namespace_project_ref_path(@project.namespace,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment