diff options
author | Hiroyuki Sato <h-sato@ruby-dev.jp> | 2016-11-07 20:44:15 +0900 |
---|---|---|
committer | Hiroyuki Sato <h-sato@ruby-dev.jp> | 2016-11-07 20:44:15 +0900 |
commit | 95a78fb53bbddfa10db7da3b12406332a7fafacc (patch) | |
tree | 44dc0cbfd340d304b0ae7bb98dd8cddeba79eb0f /app/controllers/projects/network_controller.rb | |
parent | d8cc8d7adc4c50843ecacc77a30b2e6db4e3fd84 (diff) | |
download | gitlab-ce-95a78fb53bbddfa10db7da3b12406332a7fafacc.tar.gz |
Fix bug of json request url
Diffstat (limited to 'app/controllers/projects/network_controller.rb')
-rw-r--r-- | app/controllers/projects/network_controller.rb | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/app/controllers/projects/network_controller.rb b/app/controllers/projects/network_controller.rb index e29e5994c4b..e808c9c7343 100644 --- a/app/controllers/projects/network_controller.rb +++ b/app/controllers/projects/network_controller.rb @@ -5,16 +5,16 @@ class Projects::NetworkController < Projects::ApplicationController before_action :require_non_empty_project before_action :assign_ref_vars before_action :authorize_download_code! + before_action :assign_extended_sha1 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 - if params[:extended_sha1].present? && !@commit - flash.now[:alert] = "Git revision '#{params[:extended_sha1]}' does not exist." + if @options[:extended_sha1] && !@commit + flash.now[:alert] = "Git revision '#{@options[:extended_sha1]}' does not exist." end end @@ -23,4 +23,11 @@ class Projects::NetworkController < Projects::ApplicationController end end end + + def assign_extended_sha1 + return if params[:extended_sha1].blank? + + @options[:extended_sha1] = params[:extended_sha1] + @commit = @repo.commit(@options[:extended_sha1]) + end end |