Skip to content
Snippets Groups Projects
Commit f0e994b6 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

improve MergeRequest edit page

parent 2d56d89b
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -63,12 +63,8 @@
.commit {
margin: 0;
padding: 0;
padding: 5px;
margin-bottom: 5px;
padding: 5px 0;
.avatar { position:relative }
.row_title {
color: #444;
}
.commit-author-name,
.dash,
.committed_ago,
Loading
Loading
Loading
Loading
@@ -6,39 +6,39 @@
%li= msg
 
%h3.page-title
%i.icon-code-fork
Branches
.merge-request-branches
.row
.span5
.light-well
%h5.cgray From
.padded
.ui-box
.title From
.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'})
.prepend-top-10
%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'})
.mr_source_commit.prepend-top-10
.mr_source_commit.prepend-top-10
.span2
%h1.merge-request-angle
%i.icon-angle-right
.span5
.light-well
%h5.cgray To
- projects = @project.forked_from_project.nil? ? [@project] : [ @project,@project.forked_from_project]
.padded
.ui-box
.title To
.ui-box-head
- projects = @project.forked_from_project.nil? ? [@project] : [ @project,@project.forked_from_project]
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'})
.prepend-top-10
%i.icon-code-fork
 
Branch:
= 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
 
%h3.page-title
%i.icon-paper-clip
Details
.merge-request-form-info
.control-group
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment