From: Sairam Kunala <sairam.kunala@gmail.com>
Date: Sun, 23 Oct 2011 07:17:57 +0000 (+0530)
Subject: bug fix: history in commit history not working as expected for tags and branches
X-Git-Tag: v1.2.0pre~88
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=61e6751ea676d23f5ef88de6d0bf9c273f785516;p=wvm%2Fgitlab.git

bug fix: history in commit history not working as expected for tags and branches
---

diff --git a/app/views/projects/_tree.html.haml b/app/views/projects/_tree.html.haml
index d19035864..11b04a3ba 100644
--- a/app/views/projects/_tree.html.haml
+++ b/app/views/projects/_tree.html.haml
@@ -30,15 +30,15 @@
         %th Last Update
         %th
           Last commit
-          = link_to "history", project_commits_path(@project, :path => params[:path]), :class => "right"
+          = link_to "history", project_commits_path(@project, :path => params[:path], :branch => params[:branch],:tag => params[:tag]), :class => "right"
       - if params[:path]
         - file = File.join(params[:path], "..")
         %tr{ :class => "tree-item", :url => tree_file_project_path(@project, @commit.id, file) }
           %td.tree-item-file-name
             = image_tag "dir.png"
             = link_to "..", tree_file_project_path(@project, @commit.id, file, :branch => @branch, :tag => @tag), :remote => :true
-          %td 
-          %td 
+          %td
+          %td
 
       - contents.select{ |i| i.is_a?(Grit::Tree)}.each do |content|
         = render :partial => "projects/tree_item", :locals => { :content => content }
@@ -52,7 +52,7 @@
   });
 
 - if params[:path] && request.xhr?
-  :javascript 
+  :javascript
     $(window).unbind('popstate');
     $(window).bind('popstate', function() {
       if(location.pathname.search("tree") != -1) {
diff --git a/app/views/projects/_tree_file.html.haml b/app/views/projects/_tree_file.html.haml
index 41a2287aa..b5b182138 100644
--- a/app/views/projects/_tree_file.html.haml
+++ b/app/views/projects/_tree_file.html.haml
@@ -4,7 +4,7 @@
     %strong
       = name
       = link_to "raw", blob_project_path(@project, :commit_id => @commit.id, :path => params[:path] ), :class => "right", :target => "_blank"
-      = link_to "history", project_commits_path(@project, :path => params[:path]), :class => "right", :style => "margin-right:10px;"
+      = link_to "history", project_commits_path(@project, :path => params[:path], :branch => params[:branch], :tag => params[:tag] ), :class => "right", :style => "margin-right:10px;"
       %br/
   - if file.text?
     .view_file_content
@@ -14,6 +14,6 @@
     .view_file_content_image
       %img{ :src => "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"}
   - else
-    %p 
+    %p
       %center No preview for this file type