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
Tatuya Kamada
gitlab-ce
Commits
f0e994b6
Commit
f0e994b6
authored
Aug 08, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
improve MergeRequest edit page
parent
2d56d89b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
18 deletions
+14
-18
app/assets/stylesheets/sections/merge_requests.scss
app/assets/stylesheets/sections/merge_requests.scss
+1
-5
app/views/projects/merge_requests/_form.html.haml
app/views/projects/merge_requests/_form.html.haml
+13
-13
No files found.
app/assets/stylesheets/sections/merge_requests.scss
View file @
f0e994b6
...
@@ -63,12 +63,8 @@
...
@@ -63,12 +63,8 @@
.commit
{
.commit
{
margin
:
0
;
margin
:
0
;
padding
:
0
;
padding
:
0
;
padding
:
5px
;
padding
:
5px
0
;
margin-bottom
:
5px
;
.avatar
{
position
:relative
}
.avatar
{
position
:relative
}
.row_title
{
color
:
#444
;
}
.commit-author-name
,
.commit-author-name
,
.dash
,
.dash
,
.committed_ago
,
.committed_ago
,
...
...
app/views/projects/merge_requests/_form.html.haml
View file @
f0e994b6
...
@@ -6,39 +6,39 @@
...
@@ -6,39 +6,39 @@
%li
=
msg
%li
=
msg
%h3
.page-title
%h3
.page-title
%i
.icon-code-fork
Branches
Branches
.merge-request-branches
.merge-request-branches
.row
.row
.span5
.span5
.light-well
.ui-box
%h5
.cgray
From
.title
From
.padded
.ui-box-head
Project:
=
f
.
select
(
:source_project_id
,[[
@merge_request
.
source_project
.
path_with_namespace
,
@merge_request
.
source_project
.
id
]]
,
{},
{
class:
'source_project chosen span4'
})
=
f
.
select
(
:source_project_id
,[[
@merge_request
.
source_project
.
path_with_namespace
,
@merge_request
.
source_project
.
id
]]
,
{},
{
class:
'source_project chosen span4'
})
.prepend-top-10
.prepend-top-10
%i
.icon-code-fork
%i
.icon-code-fork
Branch:
=
f
.
select
(
:source_branch
,
@merge_request
.
source_project
.
repository
.
branch_names
,
{
include_blank:
"Select branch"
},
{
class:
'source_branch chosen span3'
})
=
f
.
select
(
:source_branch
,
@merge_request
.
source_project
.
repository
.
branch_names
,
{
include_blank:
"Select branch"
},
{
class:
'source_branch chosen span3'
})
.mr_source_commit.prepend-top-10
.mr_source_commit.prepend-top-10
.span2
.span2
%h1
.merge-request-angle
%h1
.merge-request-angle
%i
.icon-angle-right
%i
.icon-angle-right
.span5
.span5
.light-well
.ui-box
%h5
.cgray
To
.title
To
.ui-box-head
-
projects
=
@project
.
forked_from_project
.
nil?
?
[
@project
]
:
[
@project
,
@project
.
forked_from_project
]
-
projects
=
@project
.
forked_from_project
.
nil?
?
[
@project
]
:
[
@project
,
@project
.
forked_from_project
]
.padded
Project:
=
f
.
select
(
:target_project_id
,
projects
.
map
{
|
proj
|
[
proj
.
path_with_namespace
,
proj
.
id
]
},
{
include_blank:
"Select Target Project"
},
{
class:
'target_project chosen span4'
})
=
f
.
select
(
:target_project_id
,
projects
.
map
{
|
proj
|
[
proj
.
path_with_namespace
,
proj
.
id
]
},
{
include_blank:
"Select Target Project"
},
{
class:
'target_project chosen span4'
})
.prepend-top-10
.prepend-top-10
%i
.icon-code-fork
%i
.icon-code-fork
Branch:
=
f
.
select
(
:target_branch
,
@target_branches
,
{
include_blank:
"Select branch"
},
{
class:
'target_branch chosen span3'
})
=
f
.
select
(
:target_branch
,
@target_branches
,
{
include_blank:
"Select branch"
},
{
class:
'target_branch chosen span3'
})
.mr_target_commit.prepend-top-10
.mr_target_commit.prepend-top-10
%hr
%hr
%h3
.page-title
%h3
.page-title
%i
.icon-paper-clip
Details
Details
.merge-request-form-info
.merge-request-form-info
.control-group
.control-group
...
...
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