New Feature: Diff patch file export for commit

randx
1 parent df6b587f
Showing 4 changed files with 28 additions and 1 deletions Show diff stats
app/controllers/commits_controller.rb
app/models/commit.rb
app/views/commits/_commit_box.html.haml
config/routes.rb
@@ -64,4 +64,15 @@ class CommitsController &lt; ApplicationController
       @commit = Commit.new(older)
     end
   end
+
+  def patch
+    @commit = project.commit(params[:id])
+    
+    send_data(
+      @commit.to_patch,
+      :type => "text/plain",
+      :disposition => 'attachment',
+      :filename => (@commit.id.to_s + ".patch")
+    )
+  end
 end
@@ -19,6 +19,7 @@ class Commit
     :diffs,
     :tree,
     :id,
+    :to_patch,
     :to => :commit
 .commit-box{class: @commit.parents.count > 1 ? "merge-commit" : ""}
   .commit-head
-    = link_to "Browse Code »", tree_project_ref_path(@project, @commit.id), :class => "browse-button"
+    .right
+      = link_to tree_project_ref_path(@project, @commit.id), :class => "browse-button primary" do 
+        %strong Browse Code »
+      - if @notes_count > 0
+        %span.btn.disabled
+          %i.icon-comment
+          = @notes_count
+        &nbsp; 
+      = link_to patch_project_commit_path(@project, @commit.id), :class => "btn small" do 
+        %i.icon-download-alt
+        Get Patch  
+      &nbsp; 
     %h3.commit-title
       = commit_msg_with_link_to_issues(@project, @commit.title)
     - if @commit.description.present?
@@ -154,6 +154,10 @@ Gitlab::Application.routes.draw do
       collection do 
         get :compare
       end
+
+      member do 
+        get :patch
+      end
     end
     resources :team_members
     resources :milestones
	@@ -64,4 +64,15 @@ class CommitsController < ApplicationController		@@ -64,4 +64,15 @@ class CommitsController < ApplicationController
64	@commit = Commit.new(older)	64	@commit = Commit.new(older)
65	end	65	end
66	end	66	end
		67	+
		68	+ def patch
		69	+ @commit = project.commit(params[:id])
		70	+
		71	+ send_data(
		72	+ @commit.to_patch,
		73	+ :type => "text/plain",
		74	+ :disposition => 'attachment',
		75	+ :filename => (@commit.id.to_s + ".patch")
		76	+ )
		77	+ end
67	end	78	end
	@@ -19,6 +19,7 @@ class Commit		@@ -19,6 +19,7 @@ class Commit
19	:diffs,	19	:diffs,
20	:tree,	20	:tree,
21	:id,	21	:id,
		22	+ :to_patch,
22	:to => :commit	23	:to => :commit
23		24
24		25
1	.commit-box{class: @commit.parents.count > 1 ? "merge-commit" : ""}	1	.commit-box{class: @commit.parents.count > 1 ? "merge-commit" : ""}
2	.commit-head	2	.commit-head
3	- = link_to "Browse Code »", tree_project_ref_path(@project, @commit.id), :class => "browse-button"	3	+ .right
		4	+ = link_to tree_project_ref_path(@project, @commit.id), :class => "browse-button primary" do
		5	+ %strong Browse Code »
		6	+ - if @notes_count > 0
		7	+ %span.btn.disabled
		8	+ %i.icon-comment
		9	+ = @notes_count
		10	+
		11	+ = link_to patch_project_commit_path(@project, @commit.id), :class => "btn small" do
		12	+ %i.icon-download-alt
		13	+ Get Patch
		14	+
4	%h3.commit-title	15	%h3.commit-title
5	= commit_msg_with_link_to_issues(@project, @commit.title)	16	= commit_msg_with_link_to_issues(@project, @commit.title)
6	- if @commit.description.present?	17	- if @commit.description.present?