Merge branch 'hiroponz-fix-404-json-file'

Dmitriy Zaporozhets
2 parents 979dcdba 29b0ac48
Showing 10 changed files with 100 additions and 150 deletions Show diff stats
app/controllers/blame_controller.rb
app/controllers/blob_controller.rb
app/controllers/edit_tree_controller.rb
app/controllers/tree_controller.rb
app/views/edit_tree/show.html.haml
app/views/tree/_blob_actions.html.haml
app/views/tree/edit.html.haml
config/routes.rb
lib/extracts_path.rb
spec/lib/extracts_path_spec.rb
@@ -7,8 +7,6 @@ class BlameController &lt; ProjectResourceController
   before_filter :authorize_code_access!
   before_filter :require_non_empty_project
  
-  before_filter :assign_ref_vars
-
   def show
     @repo = @project.repo
     @blame = Grit::Blob.blame(@repo, @commit.id, @path)
@@ -7,8 +7,6 @@ class BlobController &lt; ProjectResourceController
   before_filter :authorize_code_access!
   before_filter :require_non_empty_project
  
-  before_filter :assign_ref_vars
-
   def show
     if @tree.is_blob?
       send_data(
@@ -0,0 +1,47 @@
+# Controller for edit a repository's file
+class EditTreeController < ProjectResourceController
+  include ExtractsPath
+
+  # Authorize
+  before_filter :authorize_read_project!
+  before_filter :authorize_code_access!
+  before_filter :require_non_empty_project
+
+  before_filter :edit_requirements, only: [:edit, :update]
+
+  def show
+    @last_commit = @project.repository.last_commit_for(@ref, @path).sha
+  end
+
+  def update
+    edit_file_action = Gitlab::Satellite::EditFileAction.new(current_user, @project, @ref, @path)
+    updated_successfully = edit_file_action.commit!(
+      params[:content],
+      params[:commit_message],
+      params[:last_commit]
+    )
+
+    if updated_successfully
+      redirect_to project_tree_path(@project, @id), notice: "Your changes have been successfully commited"
+    else
+      flash[:notice] = "Your changes could not be commited, because the file has been changed"
+      render :edit
+    end
+  end
+
+  private
+
+  def edit_requirements
+    unless @tree.is_blob? && @tree.text?
+      redirect_to project_tree_path(@project, @id), notice: "You can only edit text files"
+    end
+
+    allowed = if project.protected_branch? @ref
+                can?(current_user, :push_code_to_protected_branches, project)
+              else
+                can?(current_user, :push_code, project)
+              end
+
+    return access_denied! unless allowed
+  end
+end
@@ -7,9 +7,6 @@ class TreeController &lt; ProjectResourceController
   before_filter :authorize_code_access!
   before_filter :require_non_empty_project
  
-  before_filter :assign_ref_vars
-  before_filter :edit_requirements, only: [:edit, :update]
-
   def show
     @hex_path  = Digest::SHA1.hexdigest(@path)
     @logs_path = logs_file_project_ref_path(@project, @ref, @path)
@@ -20,40 +17,4 @@ class TreeController &lt; ProjectResourceController
       format.js { no_cache_headers }
     end
   end
-
-  def edit
-    @last_commit = @project.repository.last_commit_for(@ref, @path).sha
-  end
-
-  def update
-    edit_file_action = Gitlab::Satellite::EditFileAction.new(current_user, @project, @ref, @path)
-    updated_successfully = edit_file_action.commit!(
-      params[:content],
-      params[:commit_message],
-      params[:last_commit]
-    )
-
-    if updated_successfully
-      redirect_to project_tree_path(@project, @id), notice: "Your changes have been successfully commited"
-    else
-      flash[:notice] = "Your changes could not be commited, because the file has been changed"
-      render :edit
-    end
-  end
-
-  private
-
-  def edit_requirements
-    unless @tree.is_blob? && @tree.text?
-      redirect_to project_tree_path(@project, @id), notice: "You can only edit text files"
-    end
-
-    allowed = if project.protected_branch? @ref
-                can?(current_user, :push_code_to_protected_branches, project)
-              else
-                can?(current_user, :push_code, project)
-              end
-
-    return access_denied! unless allowed
-  end
 end
@@ -0,0 +1,44 @@
+.file-editor
+  = form_tag(project_edit_tree_path(@project, @id), method: :put, class: "form-horizontal") do
+    .file_holder
+      .file_title
+        %i.icon-file
+        %span.file_name
+          = @tree.path
+          %small
+            on
+            %strong= @ref
+        %span.options
+          .btn-group.tree-btn-group
+            = link_to "Cancel", project_tree_path(@project, @id), class: "btn btn-tiny btn-cancel", confirm: "Are you sure?"
+      .file_content.code
+        %pre#editor= @tree.data
+
+    .control-group.commit_message-group
+      = label_tag 'commit_message', class: "control-label" do
+        Commit message
+      .controls
+        = text_area_tag 'commit_message', '', placeholder: "Update #{@tree.name}", required: true, rows: 3
+    .form-actions
+      = hidden_field_tag 'last_commit', @last_commit
+      = hidden_field_tag 'content', '', id: :file_content
+      .commit-button-annotation
+        = button_tag "Commit", class: 'btn commit-btn js-commit-button'
+        .message
+          to branch
+          %strong= @ref
+      = link_to "Cancel", project_tree_path(@project, @id), class: "btn btn-cancel", confirm: "Are you sure?"
+
+:javascript
+  var ace_mode = "#{@tree.language.try(:ace_mode)}";
+  var editor = ace.edit("editor");
+  if (ace_mode) {
+    editor.getSession().setMode('ace/mode/' + ace_mode);
+  }
+
+  disableButtonIfEmptyField("#commit_message", ".js-commit-button");
+
+  $(".js-commit-button").click(function(){
+    $("#file_content").val(editor.getValue());
+    $(".file-editor form").submit();
+  });
 .btn-group.tree-btn-group
   -# only show edit link for text files
   - if @tree.text?
-    = link_to "edit", edit_project_tree_path(@project, @id), class: "btn btn-tiny", disabled: !allowed_tree_edit?
+    = link_to "edit", project_edit_tree_path(@project, @id), class: "btn btn-tiny", disabled: !allowed_tree_edit?
   = link_to "raw", project_blob_path(@project, @id), class: "btn btn-tiny", target: "_blank"
   -# only show normal/blame view links for text files
   - if @tree.text?
@@ -1,44 +0,0 @@
-.file-editor
-  = form_tag(project_tree_path(@project, @id), method: :put, class: "form-horizontal") do
-    .file_holder
-      .file_title
-        %i.icon-file
-        %span.file_name
-          = @tree.path
-          %small
-            on
-            %strong= @ref
-        %span.options
-          .btn-group.tree-btn-group
-            = link_to "Cancel", project_tree_path(@project, @id), class: "btn btn-tiny btn-cancel", confirm: "Are you sure?"
-      .file_content.code
-        %pre#editor= @tree.data
-
-    .control-group.commit_message-group
-      = label_tag 'commit_message', class: "control-label" do
-        Commit message
-      .controls
-        = text_area_tag 'commit_message', '', placeholder: "Update #{@tree.name}", required: true, rows: 3
-    .form-actions
-      = hidden_field_tag 'last_commit', @last_commit
-      = hidden_field_tag 'content', '', id: :file_content
-      .commit-button-annotation
-        = button_tag "Commit", class: 'btn commit-btn js-commit-button'
-        .message
-          to branch
-          %strong= @ref
-      = link_to "Cancel", project_tree_path(@project, @id), class: "btn btn-cancel", confirm: "Are you sure?"
-
-:javascript
-  var ace_mode = "#{@tree.language.try(:ace_mode)}";
-  var editor = ace.edit("editor");
-  if (ace_mode) {
-    editor.getSession().setMode('ace/mode/' + ace_mode);
-  }
-
-  disableButtonIfEmptyField("#commit_message", ".js-commit-button");
-
-  $(".js-commit-button").click(function(){
-    $("#file_content").val(editor.getValue());
-    $(".file-editor form").submit();
-  });
@@ -168,7 +168,8 @@ Gitlab::Application.routes.draw do
   #
   resources :projects, constraints: { id: /(?:[a-zA-Z.0-9_\-]+\/)?[a-zA-Z.0-9_\-]+/ }, except: [:new, :create, :index], path: "/" do
     resources :blob,    only: [:show], constraints: {id: /.+/}
-    resources :tree,    only: [:show, :edit, :update], constraints: {id: /.+/}
+    resources :tree,    only: [:show], constraints: {id: /.+/, format: /(html|js)/ }
+    resources :edit_tree,    only: [:show, :update], constraints: {id: /.+/}, path: 'edit'
     resources :commit,  only: [:show], constraints: {id: /[[:alnum:]]{6,40}/}
     resources :commits, only: [:show], constraints: {id: /(?:[^.]|\.(?!atom$))+/, format: /atom/}
     resources :compare, only: [:index, :create]
@@ -8,7 +8,7 @@ module ExtractsPath
  
   included do
     if respond_to?(:before_filter)
-      before_filter :assign_ref_vars, only: [:show]
+      before_filter :assign_ref_vars
     end
   end
  
@@ -33,7 +33,7 @@ module ExtractsPath
   #   extract_ref("v2.0.0/README.md")
   #   # => ['v2.0.0', 'README.md']
   #
-  #   extract_ref('/gitlab/vagrant/tree/master/app/models/project.rb')
+  #   extract_ref('master/app/models/project.rb')
   #   # => ['master', 'app/models/project.rb']
   #
   #   extract_ref('issues/1234/app/models/project.rb')
@@ -45,22 +45,12 @@ module ExtractsPath
   #
   # Returns an Array where the first value is the tree-ish and the second is the
   # path
-  def extract_ref(input)
+  def extract_ref(id)
     pair = ['', '']
  
     return pair unless @project
  
-    # Remove relative_url_root from path
-    input.gsub!(/^#{Gitlab.config.gitlab.relative_url_root}/, "")
-    # Remove project, actions and all other staff from path
-    input.gsub!(/^\/#{Regexp.escape(@project.path_with_namespace)}/, "")
-    input.gsub!(/^\/(tree|commits|blame|blob|refs|graph)\//, "") # remove actions
-    input.gsub!(/\?.*$/, "") # remove stamps suffix
-    input.gsub!(/.atom$/, "") # remove rss feed
-    input.gsub!(/.json$/, "") # remove json suffix
-    input.gsub!(/\/edit$/, "") # remove edit route part
-
-    if input.match(/^([[:alnum:]]{40})(.+)/)
+    if id.match(/^([[:alnum:]]{40})(.+)/)
       # If the ref appears to be a SHA, we're done, just split the string
       pair = $~.captures
     else
@@ -68,7 +58,6 @@ module ExtractsPath
       # branches and tags
  
       # Append a trailing slash if we only get a ref and no file path
-      id = input
       id += '/' unless id.ends_with?('/')
  
       valid_refs = @project.repository.ref_names
@@ -105,11 +94,9 @@ module ExtractsPath
   # Automatically renders `not_found!` if a valid tree path could not be
   # resolved (e.g., when a user inserts an invalid path or ref).
   def assign_ref_vars
-    path = CGI::unescape(request.fullpath.dup)
-
-    @ref, @path = extract_ref(path)
+    @id = params[:id]
  
-    @id = File.join(@ref, @path)
+    @ref, @path = extract_ref(@id)
  
     # It is used "@project.repository.commits(@ref, @path, 1, 0)",
     # because "@project.repository.commit(@ref)" returns wrong commit when @ref is tag name.
@@ -54,47 +54,5 @@ describe ExtractsPath do
         extract_ref('stable/CHANGELOG').should == ['stable', 'CHANGELOG']
       end
     end
-
-    context "with a fullpath" do
-      it "extracts a valid branch" do
-        extract_ref('/gitlab/gitlab-ci/tree/foo/bar/baz/CHANGELOG').should == ['foo/bar/baz', 'CHANGELOG']
-      end
-
-      it "extracts a valid tag" do
-        extract_ref('/gitlab/gitlab-ci/tree/v2.0.0/CHANGELOG').should == ['v2.0.0', 'CHANGELOG']
-      end
-
-      it "extracts a valid commit SHA" do
-        extract_ref('/gitlab/gitlab-ci/tree/f4b14494ef6abf3d144c28e4af0c20143383e062/CHANGELOG').should ==
-          ['f4b14494ef6abf3d144c28e4af0c20143383e062', 'CHANGELOG']
-      end
-
-      it "extracts a timestamp" do
-        extract_ref('/gitlab/gitlab-ci/tree/v2.0.0/CHANGELOG?_=12354435').should == ['v2.0.0', 'CHANGELOG']
-      end
-    end
-
-    context "with a fullpath and a relative_url_root" do
-      before do
-        Gitlab.config.gitlab.stub(relative_url_root: '/relative')
-      end
-
-      it "extracts a valid branch with relative_url_root" do
-        extract_ref('/relative/gitlab/gitlab-ci/tree/foo/bar/baz/CHANGELOG').should == ['foo/bar/baz', 'CHANGELOG']
-      end
-
-      it "extracts a valid tag" do
-        extract_ref('/relative/gitlab/gitlab-ci/tree/v2.0.0/CHANGELOG').should == ['v2.0.0', 'CHANGELOG']
-      end
-
-      it "extracts a valid commit SHA" do
-        extract_ref('/relative/gitlab/gitlab-ci/tree/f4b14494ef6abf3d144c28e4af0c20143383e062/CHANGELOG').should ==
-          ['f4b14494ef6abf3d144c28e4af0c20143383e062', 'CHANGELOG']
-      end
-
-      it "extracts a timestamp" do
-        extract_ref('/relative/gitlab/gitlab-ci/tree/v2.0.0/CHANGELOG?_=12354435').should == ['v2.0.0', 'CHANGELOG']
-      end
-    end
   end
 end
...	...	@@ -7,8 +7,6 @@ class BlameController < ProjectResourceController
7	7	before_filter :authorize_code_access!
8	8	before_filter :require_non_empty_project
9	9
10		- before_filter :assign_ref_vars
11		-
12	10	def show
13	11	@repo = @project.repo
14	12	@blame = Grit::Blob.blame(@repo, @commit.id, @path)
...	...
...	...	@@ -7,8 +7,6 @@ class BlobController < ProjectResourceController
7	7	before_filter :authorize_code_access!
8	8	before_filter :require_non_empty_project
9	9
10		- before_filter :assign_ref_vars
11		-
12	10	def show
13	11	if @tree.is_blob?
14	12	send_data(
...	...
...	...	@@ -0,0 +1,47 @@
	1	+# Controller for edit a repository's file
	2	+class EditTreeController < ProjectResourceController
	3	+ include ExtractsPath
	4	+
	5	+ # Authorize
	6	+ before_filter :authorize_read_project!
	7	+ before_filter :authorize_code_access!
	8	+ before_filter :require_non_empty_project
	9	+
	10	+ before_filter :edit_requirements, only: [:edit, :update]
	11	+
	12	+ def show
	13	+ @last_commit = @project.repository.last_commit_for(@ref, @path).sha
	14	+ end
	15	+
	16	+ def update
	17	+ edit_file_action = Gitlab::Satellite::EditFileAction.new(current_user, @project, @ref, @path)
	18	+ updated_successfully = edit_file_action.commit!(
	19	+ params[:content],
	20	+ params[:commit_message],
	21	+ params[:last_commit]
	22	+ )
	23	+
	24	+ if updated_successfully
	25	+ redirect_to project_tree_path(@project, @id), notice: "Your changes have been successfully commited"
	26	+ else
	27	+ flash[:notice] = "Your changes could not be commited, because the file has been changed"
	28	+ render :edit
	29	+ end
	30	+ end
	31	+
	32	+ private
	33	+
	34	+ def edit_requirements
	35	+ unless @tree.is_blob? && @tree.text?
	36	+ redirect_to project_tree_path(@project, @id), notice: "You can only edit text files"
	37	+ end
	38	+
	39	+ allowed = if project.protected_branch? @ref
	40	+ can?(current_user, :push_code_to_protected_branches, project)
	41	+ else
	42	+ can?(current_user, :push_code, project)
	43	+ end
	44	+
	45	+ return access_denied! unless allowed
	46	+ end
	47	+end
...	...
...	...	@@ -7,9 +7,6 @@ class TreeController < ProjectResourceController
7	7	before_filter :authorize_code_access!
8	8	before_filter :require_non_empty_project
9	9
10		- before_filter :assign_ref_vars
11		- before_filter :edit_requirements, only: [:edit, :update]
12		-
13	10	def show
14	11	@hex_path = Digest::SHA1.hexdigest(@path)
15	12	@logs_path = logs_file_project_ref_path(@project, @ref, @path)
...	...	@@ -20,40 +17,4 @@ class TreeController < ProjectResourceController
20	17	format.js { no_cache_headers }
21	18	end
22	19	end
23		-
24		- def edit
25		- @last_commit = @project.repository.last_commit_for(@ref, @path).sha
26		- end
27		-
28		- def update
29		- edit_file_action = Gitlab::Satellite::EditFileAction.new(current_user, @project, @ref, @path)
30		- updated_successfully = edit_file_action.commit!(
31		- params[:content],
32		- params[:commit_message],
33		- params[:last_commit]
34		- )
35		-
36		- if updated_successfully
37		- redirect_to project_tree_path(@project, @id), notice: "Your changes have been successfully commited"
38		- else
39		- flash[:notice] = "Your changes could not be commited, because the file has been changed"
40		- render :edit
41		- end
42		- end
43		-
44		- private
45		-
46		- def edit_requirements
47		- unless @tree.is_blob? && @tree.text?
48		- redirect_to project_tree_path(@project, @id), notice: "You can only edit text files"
49		- end
50		-
51		- allowed = if project.protected_branch? @ref
52		- can?(current_user, :push_code_to_protected_branches, project)
53		- else
54		- can?(current_user, :push_code, project)
55		- end
56		-
57		- return access_denied! unless allowed
58		- end
59	20	end
...	...
...	...	@@ -0,0 +1,44 @@
	1	+.file-editor
	2	+ = form_tag(project_edit_tree_path(@project, @id), method: :put, class: "form-horizontal") do
	3	+ .file_holder
	4	+ .file_title
	5	+ %i.icon-file
	6	+ %span.file_name
	7	+ = @tree.path
	8	+ %small
	9	+ on
	10	+ %strong= @ref
	11	+ %span.options
	12	+ .btn-group.tree-btn-group
	13	+ = link_to "Cancel", project_tree_path(@project, @id), class: "btn btn-tiny btn-cancel", confirm: "Are you sure?"
	14	+ .file_content.code
	15	+ %pre#editor= @tree.data
	16	+
	17	+ .control-group.commit_message-group
	18	+ = label_tag 'commit_message', class: "control-label" do
	19	+ Commit message
	20	+ .controls
	21	+ = text_area_tag 'commit_message', '', placeholder: "Update #{@tree.name}", required: true, rows: 3
	22	+ .form-actions
	23	+ = hidden_field_tag 'last_commit', @last_commit
	24	+ = hidden_field_tag 'content', '', id: :file_content
	25	+ .commit-button-annotation
	26	+ = button_tag "Commit", class: 'btn commit-btn js-commit-button'
	27	+ .message
	28	+ to branch
	29	+ %strong= @ref
	30	+ = link_to "Cancel", project_tree_path(@project, @id), class: "btn btn-cancel", confirm: "Are you sure?"
	31	+
	32	+:javascript
	33	+ var ace_mode = "#{@tree.language.try(:ace_mode)}";
	34	+ var editor = ace.edit("editor");
	35	+ if (ace_mode) {
	36	+ editor.getSession().setMode('ace/mode/' + ace_mode);
	37	+ }
	38	+
	39	+ disableButtonIfEmptyField("#commit_message", ".js-commit-button");
	40	+
	41	+ $(".js-commit-button").click(function(){
	42	+ $("#file_content").val(editor.getValue());
	43	+ $(".file-editor form").submit();
	44	+ });
...	...
1	1	.btn-group.tree-btn-group
2	2	-# only show edit link for text files
3	3	- if @tree.text?
4		- = link_to "edit", edit_project_tree_path(@project, @id), class: "btn btn-tiny", disabled: !allowed_tree_edit?
	4	+ = link_to "edit", project_edit_tree_path(@project, @id), class: "btn btn-tiny", disabled: !allowed_tree_edit?
5	5	= link_to "raw", project_blob_path(@project, @id), class: "btn btn-tiny", target: "_blank"
6	6	-# only show normal/blame view links for text files
7	7	- if @tree.text?
...	...
...	...	@@ -1,44 +0,0 @@
1		-.file-editor
2		- = form_tag(project_tree_path(@project, @id), method: :put, class: "form-horizontal") do
3		- .file_holder
4		- .file_title
5		- %i.icon-file
6		- %span.file_name
7		- = @tree.path
8		- %small
9		- on
10		- %strong= @ref
11		- %span.options
12		- .btn-group.tree-btn-group
13		- = link_to "Cancel", project_tree_path(@project, @id), class: "btn btn-tiny btn-cancel", confirm: "Are you sure?"
14		- .file_content.code
15		- %pre#editor= @tree.data
16		-
17		- .control-group.commit_message-group
18		- = label_tag 'commit_message', class: "control-label" do
19		- Commit message
20		- .controls
21		- = text_area_tag 'commit_message', '', placeholder: "Update #{@tree.name}", required: true, rows: 3
22		- .form-actions
23		- = hidden_field_tag 'last_commit', @last_commit
24		- = hidden_field_tag 'content', '', id: :file_content
25		- .commit-button-annotation
26		- = button_tag "Commit", class: 'btn commit-btn js-commit-button'
27		- .message
28		- to branch
29		- %strong= @ref
30		- = link_to "Cancel", project_tree_path(@project, @id), class: "btn btn-cancel", confirm: "Are you sure?"
31		-
32		-:javascript
33		- var ace_mode = "#{@tree.language.try(:ace_mode)}";
34		- var editor = ace.edit("editor");
35		- if (ace_mode) {
36		- editor.getSession().setMode('ace/mode/' + ace_mode);
37		- }
38		-
39		- disableButtonIfEmptyField("#commit_message", ".js-commit-button");
40		-
41		- $(".js-commit-button").click(function(){
42		- $("#file_content").val(editor.getValue());
43		- $(".file-editor form").submit();
44		- });
...	...	@@ -168,7 +168,8 @@ Gitlab::Application.routes.draw do
168	168	#
169	169	resources :projects, constraints: { id: /(?:[a-zA-Z.0-9_\-]+\/)?[a-zA-Z.0-9_\-]+/ }, except: [:new, :create, :index], path: "/" do
170	170	resources :blob, only: [:show], constraints: {id: /.+/}
171		- resources :tree, only: [:show, :edit, :update], constraints: {id: /.+/}
	171	+ resources :tree, only: [:show], constraints: {id: /.+/, format: /(html\|js)/ }
	172	+ resources :edit_tree, only: [:show, :update], constraints: {id: /.+/}, path: 'edit'
172	173	resources :commit, only: [:show], constraints: {id: /[[:alnum:]]{6,40}/}
173	174	resources :commits, only: [:show], constraints: {id: /(?:[^.]\|\.(?!atom$))+/, format: /atom/}
174	175	resources :compare, only: [:index, :create]
...	...
...	...	@@ -8,7 +8,7 @@ module ExtractsPath
8	8
9	9	included do
10	10	if respond_to?(:before_filter)
11		- before_filter :assign_ref_vars, only: [:show]
	11	+ before_filter :assign_ref_vars
12	12	end
13	13	end
14	14
...	...	@@ -33,7 +33,7 @@ module ExtractsPath
33	33	# extract_ref("v2.0.0/README.md")
34	34	# # => ['v2.0.0', 'README.md']
35	35	#
36		- # extract_ref('/gitlab/vagrant/tree/master/app/models/project.rb')
	36	+ # extract_ref('master/app/models/project.rb')
37	37	# # => ['master', 'app/models/project.rb']
38	38	#
39	39	# extract_ref('issues/1234/app/models/project.rb')
...	...	@@ -45,22 +45,12 @@ module ExtractsPath
45	45	#
46	46	# Returns an Array where the first value is the tree-ish and the second is the
47	47	# path
48		- def extract_ref(input)
	48	+ def extract_ref(id)
49	49	pair = ['', '']
50	50
51	51	return pair unless @project
52	52
53		- # Remove relative_url_root from path
54		- input.gsub!(/^#{Gitlab.config.gitlab.relative_url_root}/, "")
55		- # Remove project, actions and all other staff from path
56		- input.gsub!(/^\/#{Regexp.escape(@project.path_with_namespace)}/, "")
57		- input.gsub!(/^\/(tree\|commits\|blame\|blob\|refs\|graph)\//, "") # remove actions
58		- input.gsub!(/\?.*$/, "") # remove stamps suffix
59		- input.gsub!(/.atom$/, "") # remove rss feed
60		- input.gsub!(/.json$/, "") # remove json suffix
61		- input.gsub!(/\/edit$/, "") # remove edit route part
62		-
63		- if input.match(/^([[:alnum:]]{40})(.+)/)
	53	+ if id.match(/^([[:alnum:]]{40})(.+)/)
64	54	# If the ref appears to be a SHA, we're done, just split the string
65	55	pair = $~.captures
66	56	else
...	...	@@ -68,7 +58,6 @@ module ExtractsPath
68	58	# branches and tags
69	59
70	60	# Append a trailing slash if we only get a ref and no file path
71		- id = input
72	61	id += '/' unless id.ends_with?('/')
73	62
74	63	valid_refs = @project.repository.ref_names
...	...	@@ -105,11 +94,9 @@ module ExtractsPath
105	94	# Automatically renders `not_found!` if a valid tree path could not be
106	95	# resolved (e.g., when a user inserts an invalid path or ref).
107	96	def assign_ref_vars
108		- path = CGI::unescape(request.fullpath.dup)
109		-
110		- @ref, @path = extract_ref(path)
	97	+ @id = params[:id]
111	98
112		- @id = File.join(@ref, @path)
	99	+ @ref, @path = extract_ref(@id)
113	100
114	101	# It is used "@project.repository.commits(@ref, @path, 1, 0)",
115	102	# because "@project.repository.commit(@ref)" returns wrong commit when @ref is tag name.
...	...
...	...	@@ -54,47 +54,5 @@ describe ExtractsPath do
54	54	extract_ref('stable/CHANGELOG').should == ['stable', 'CHANGELOG']
55	55	end
56	56	end
57		-
58		- context "with a fullpath" do
59		- it "extracts a valid branch" do
60		- extract_ref('/gitlab/gitlab-ci/tree/foo/bar/baz/CHANGELOG').should == ['foo/bar/baz', 'CHANGELOG']
61		- end
62		-
63		- it "extracts a valid tag" do
64		- extract_ref('/gitlab/gitlab-ci/tree/v2.0.0/CHANGELOG').should == ['v2.0.0', 'CHANGELOG']
65		- end
66		-
67		- it "extracts a valid commit SHA" do
68		- extract_ref('/gitlab/gitlab-ci/tree/f4b14494ef6abf3d144c28e4af0c20143383e062/CHANGELOG').should ==
69		- ['f4b14494ef6abf3d144c28e4af0c20143383e062', 'CHANGELOG']
70		- end
71		-
72		- it "extracts a timestamp" do
73		- extract_ref('/gitlab/gitlab-ci/tree/v2.0.0/CHANGELOG?_=12354435').should == ['v2.0.0', 'CHANGELOG']
74		- end
75		- end
76		-
77		- context "with a fullpath and a relative_url_root" do
78		- before do
79		- Gitlab.config.gitlab.stub(relative_url_root: '/relative')
80		- end
81		-
82		- it "extracts a valid branch with relative_url_root" do
83		- extract_ref('/relative/gitlab/gitlab-ci/tree/foo/bar/baz/CHANGELOG').should == ['foo/bar/baz', 'CHANGELOG']
84		- end
85		-
86		- it "extracts a valid tag" do
87		- extract_ref('/relative/gitlab/gitlab-ci/tree/v2.0.0/CHANGELOG').should == ['v2.0.0', 'CHANGELOG']
88		- end
89		-
90		- it "extracts a valid commit SHA" do
91		- extract_ref('/relative/gitlab/gitlab-ci/tree/f4b14494ef6abf3d144c28e4af0c20143383e062/CHANGELOG').should ==
92		- ['f4b14494ef6abf3d144c28e4af0c20143383e062', 'CHANGELOG']
93		- end
94		-
95		- it "extracts a timestamp" do
96		- extract_ref('/relative/gitlab/gitlab-ci/tree/v2.0.0/CHANGELOG?_=12354435').should == ['v2.0.0', 'CHANGELOG']
97		- end
98		- end
99	57	end
100	58	end
...	...