summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorHiroyuki Sato <h-sato@ruby-dev.jp>2016-11-06 12:33:39 +0900
committerHiroyuki Sato <h-sato@ruby-dev.jp>2016-11-06 12:33:39 +0900
commitd8cc8d7adc4c50843ecacc77a30b2e6db4e3fd84 (patch)
tree2cd5a166ecbbefb83df02133391f54caff029664 /app
parentd02f7d29c07632f219e103ba256636f49329067c (diff)
downloadgitlab-ce-d8cc8d7adc4c50843ecacc77a30b2e6db4e3fd84.tar.gz
Remove 'extended_sha1' option from ExtractsPath module
Diffstat (limited to 'app')
-rw-r--r--app/controllers/projects/network_controller.rb1
-rw-r--r--app/views/projects/network/show.html.haml2
2 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/projects/network_controller.rb b/app/controllers/projects/network_controller.rb
index 3dbc7a492b5..e29e5994c4b 100644
--- a/app/controllers/projects/network_controller.rb
+++ b/app/controllers/projects/network_controller.rb
@@ -9,6 +9,7 @@ class Projects::NetworkController < Projects::ApplicationController
def show
@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 = @repo.commit(params[:extended_sha1]) if params[:extended_sha1].present?
respond_to do |format|
format.html do
diff --git a/app/views/projects/network/show.html.haml b/app/views/projects/network/show.html.haml
index d8951e69242..af565873444 100644
--- a/app/views/projects/network/show.html.haml
+++ b/app/views/projects/network/show.html.haml
@@ -8,7 +8,7 @@
.project-network
.controls
= 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
= icon('search')
.inline.prepend-left-20