Tabs styled. MR Get Patch

randx
1 parent 3ce629fd
Showing 6 changed files with 30 additions and 7 deletions Show diff stats
app/assets/stylesheets/nav.scss
app/assets/stylesheets/themes/ui_modern.scss
app/controllers/merge_requests_controller.rb
app/models/merge_request.rb
app/views/merge_requests/show/_mr_title.html.haml
config/routes.rb
@@ -8,7 +8,7 @@ ul.main_menu {
   margin:30px 0;
   background:#eee;
   border:1px solid #bbb;
-  height:36px;
+  height:37px;
   background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
   background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
   background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
@@ -44,6 +44,7 @@ ul.main_menu {
     width: 1%;
     border-right: 1px solid #DDD;
     border-left: 1px solid #EEE;
+    border-bottom:2px solid #CFCFCF;
  
     &:first-child{ 
       -webkit-border-top-left-radius: 4px;
@@ -57,7 +58,7 @@ ul.main_menu {
  
     &.current { 
       background-color:#D5D5D5;
-      border-bottom: 1px solid #567;
+      border-bottom: 2px solid $style_color;
       border-right: 1px solid #BBB;
       border-left: 1px solid #BBB;
       border-radius: 0 0 1px 1px;
@@ -23,7 +23,7 @@
         border-bottom:2px solid #f90;
         background-color:#fff;
         position:relative;
-        top:1px;
+        top:2px;
       }
     }
   }
@@ -2,8 +2,8 @@ class MergeRequestsController &lt; ApplicationController
   before_filter :authenticate_user!
   before_filter :project
   before_filter :module_enabled
-  before_filter :merge_request, :only => [:edit, :update, :destroy, :show, :commits, :diffs, :automerge, :automerge_check]
-  before_filter :validates_merge_request, :only => [:show, :diffs]
+  before_filter :merge_request, :only => [:edit, :update, :destroy, :show, :commits, :diffs, :automerge, :automerge_check, :raw]
+  before_filter :validates_merge_request, :only => [:show, :diffs, :raw]
   before_filter :define_show_vars, :only => [:show, :diffs]
   layout "project"
  
@@ -43,6 +43,10 @@ class MergeRequestsController &lt; ApplicationController
     end
   end
  
+  def raw
+    send_file @merge_request.to_raw
+  end
+
   def diffs
     @diffs = @merge_request.diffs
     @commit = @merge_request.last_commit
@@ -193,6 +193,18 @@ class MergeRequest &lt; ActiveRecord::Base
     self.mark_as_unmergable
     false
   end
+
+  def to_raw
+    FileUtils.mkdir_p(Rails.root.join("tmp", "patches"))
+    patch_path = Rails.root.join("tmp", "patches", "merge_request_#{self.id}.patch")
+
+    from = commits.last.id
+    to = source_branch
+
+    project.repo.git.run('', "format-patch" , " > #{patch_path.to_s}", {}, ["#{from}..#{to}", "--stdout"])
+
+    patch_path
+  end
 end
 # == Schema Information
 #
@@ -13,8 +13,13 @@
           = "MERGED"
     - if can?(current_user, :modify_merge_request, @merge_request)
       - if @merge_request.open?
-        = link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn small padded danger", :title => "Close merge request"
-        = link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn small padded" do
+        = link_to raw_project_merge_request_path(@project, @merge_request), :class => "btn padded" do 
+          %i.icon-download-alt
+          Get Patch  
+
+        = link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn padded danger", :title => "Close merge request"
+
+        = link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn padded" do
           %i.icon-edit
           Edit
  
@@ -144,6 +144,7 @@ Gitlab::Application.routes.draw do
         get :diffs
         get :automerge
         get :automerge_check
+        get :raw
       end
  
       collection do
...	...	@@ -8,7 +8,7 @@ ul.main_menu {
8	8	margin:30px 0;
9	9	background:#eee;
10	10	border:1px solid #bbb;
11		- height:36px;
	11	+ height:37px;
12	12	background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
13	13	background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
14	14	background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
...	...	@@ -44,6 +44,7 @@ ul.main_menu {
44	44	width: 1%;
45	45	border-right: 1px solid #DDD;
46	46	border-left: 1px solid #EEE;
	47	+ border-bottom:2px solid #CFCFCF;
47	48
48	49	&:first-child{
49	50	-webkit-border-top-left-radius: 4px;
...	...	@@ -57,7 +58,7 @@ ul.main_menu {
57	58
58	59	&.current {
59	60	background-color:#D5D5D5;
60		- border-bottom: 1px solid #567;
	61	+ border-bottom: 2px solid $style_color;
61	62	border-right: 1px solid #BBB;
62	63	border-left: 1px solid #BBB;
63	64	border-radius: 0 0 1px 1px;
...	...
...	...	@@ -23,7 +23,7 @@
23	23	border-bottom:2px solid #f90;
24	24	background-color:#fff;
25	25	position:relative;
26		- top:1px;
	26	+ top:2px;
27	27	}
28	28	}
29	29	}
...	...
...	...	@@ -2,8 +2,8 @@ class MergeRequestsController < ApplicationController
2	2	before_filter :authenticate_user!
3	3	before_filter :project
4	4	before_filter :module_enabled
5		- before_filter :merge_request, :only => [:edit, :update, :destroy, :show, :commits, :diffs, :automerge, :automerge_check]
6		- before_filter :validates_merge_request, :only => [:show, :diffs]
	5	+ before_filter :merge_request, :only => [:edit, :update, :destroy, :show, :commits, :diffs, :automerge, :automerge_check, :raw]
	6	+ before_filter :validates_merge_request, :only => [:show, :diffs, :raw]
7	7	before_filter :define_show_vars, :only => [:show, :diffs]
8	8	layout "project"
9	9
...	...	@@ -43,6 +43,10 @@ class MergeRequestsController < ApplicationController
43	43	end
44	44	end
45	45
	46	+ def raw
	47	+ send_file @merge_request.to_raw
	48	+ end
	49	+
46	50	def diffs
47	51	@diffs = @merge_request.diffs
48	52	@commit = @merge_request.last_commit
...	...
...	...	@@ -193,6 +193,18 @@ class MergeRequest < ActiveRecord::Base
193	193	self.mark_as_unmergable
194	194	false
195	195	end
	196	+
	197	+ def to_raw
	198	+ FileUtils.mkdir_p(Rails.root.join("tmp", "patches"))
	199	+ patch_path = Rails.root.join("tmp", "patches", "merge_request_#{self.id}.patch")
	200	+
	201	+ from = commits.last.id
	202	+ to = source_branch
	203	+
	204	+ project.repo.git.run('', "format-patch" , " > #{patch_path.to_s}", {}, ["#{from}..#{to}", "--stdout"])
	205	+
	206	+ patch_path
	207	+ end
196	208	end
197	209	# == Schema Information
198	210	#
...	...
...	...	@@ -13,8 +13,13 @@
13	13	= "MERGED"
14	14	- if can?(current_user, :modify_merge_request, @merge_request)
15	15	- if @merge_request.open?
16		- = link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn small padded danger", :title => "Close merge request"
17		- = link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn small padded" do
	16	+ = link_to raw_project_merge_request_path(@project, @merge_request), :class => "btn padded" do
	17	+ %i.icon-download-alt
	18	+ Get Patch
	19	+
	20	+ = link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn padded danger", :title => "Close merge request"
	21	+
	22	+ = link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn padded" do
18	23	%i.icon-edit
19	24	Edit
20	25
...	...
...	...	@@ -144,6 +144,7 @@ Gitlab::Application.routes.draw do
144	144	get :diffs
145	145	get :automerge
146	146	get :automerge_check
	147	+ get :raw
147	148	end
148	149
149	150	collection do
...	...