Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
264ee0c5
Commit
264ee0c5
authored
12 years ago
by
randx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tabs styled. MR Get Patch
parent
3ce629fd
No related merge requests found
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
30 additions
and
7 deletions
+30
-7
app/assets/stylesheets/nav.scss
app/assets/stylesheets/nav.scss
+3
-2
app/assets/stylesheets/themes/ui_modern.scss
app/assets/stylesheets/themes/ui_modern.scss
+1
-1
app/controllers/merge_requests_controller.rb
app/controllers/merge_requests_controller.rb
+6
-2
app/models/merge_request.rb
app/models/merge_request.rb
+12
-0
app/views/merge_requests/show/_mr_title.html.haml
app/views/merge_requests/show/_mr_title.html.haml
+7
-2
config/routes.rb
config/routes.rb
+1
-0
No files found.
app/assets/stylesheets/nav.scss
View file @
264ee0c5
...
...
@@ -8,7 +8,7 @@ ul.main_menu {
margin
:
30px
0
;
background
:
#eee
;
border
:
1px
solid
#bbb
;
height
:
3
6
px
;
height
:
3
7
px
;
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
;
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/themes/ui_modern.scss
View file @
264ee0c5
...
...
@@ -23,7 +23,7 @@
border-bottom
:
2px
solid
#f90
;
background-color
:
#fff
;
position
:relative
;
top
:
1
px
;
top
:
2
px
;
}
}
}
...
...
This diff is collapsed.
Click to expand it.
app/controllers/merge_requests_controller.rb
View file @
264ee0c5
...
...
@@ -2,8 +2,8 @@ class MergeRequestsController < 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 < ApplicationController
end
end
def
raw
send_file
@merge_request
.
to_raw
end
def
diffs
@diffs
=
@merge_request
.
diffs
@commit
=
@merge_request
.
last_commit
...
...
This diff is collapsed.
Click to expand it.
app/models/merge_request.rb
View file @
264ee0c5
...
...
@@ -193,6 +193,18 @@ class MergeRequest < 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
#
...
...
This diff is collapsed.
Click to expand it.
app/views/merge_requests/show/_mr_title.html.haml
View file @
264ee0c5
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
config/routes.rb
View file @
264ee0c5
...
...
@@ -144,6 +144,7 @@ Gitlab::Application.routes.draw do
get
:diffs
get
:automerge
get
:automerge_check
get
:raw
end
collection
do
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment