Download as
Browse Code »

Commit f0e994b6c0cd27b52683c2c67cb59f0de71e0f99

Authored by Dmitriy Zaporozhets
1 parent 2d56d89b
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

improve MergeRequest edit page

Showing 2 changed files with 14 additions and 18 deletions   Show diff stats
app/assets/stylesheets/sections/merge_requests.scss
  Diff comments   View file @f0e994b
@@ -63,12 +63,8 @@ @@ -63,12 +63,8 @@
63 .commit { 63 .commit {
64 margin: 0; 64 margin: 0;
65 padding: 0; 65 padding: 0;
66 - padding: 5px;  
67 - margin-bottom: 5px; 66 + padding: 5px 0;
68 .avatar { position:relative } 67 .avatar { position:relative }
69 - .row_title {  
70 - color: #444;  
71 - }  
72 .commit-author-name, 68 .commit-author-name,
73 .dash, 69 .dash,
74 .committed_ago, 70 .committed_ago,
app/views/projects/merge_requests/_form.html.haml
  Diff comments   View file @f0e994b
@@ -6,39 +6,39 @@ @@ -6,39 +6,39 @@
6 %li= msg 6 %li= msg
7 7
8 %h3.page-title 8 %h3.page-title
9 - %i.icon-code-fork  
10 Branches 9 Branches
11 .merge-request-branches 10 .merge-request-branches
12 .row 11 .row
13 .span5 12 .span5
14 - .light-well  
15 - %h5.cgray From  
16 - .padded 13 + .ui-box
  14 + .title From
  15 + .ui-box-head
  16 + Project:
17 = f.select(:source_project_id,[[@merge_request.source_project.path_with_namespace,@merge_request.source_project.id]] , {}, {class: 'source_project chosen span4'}) 17 = f.select(:source_project_id,[[@merge_request.source_project.path_with_namespace,@merge_request.source_project.id]] , {}, {class: 'source_project chosen span4'})
18 .prepend-top-10 18 .prepend-top-10
19 %i.icon-code-fork 19 %i.icon-code-fork
20 -   20 + Branch:
21 = f.select(:source_branch, @merge_request.source_project.repository.branch_names, { include_blank: "Select branch" }, {class: 'source_branch chosen span3'}) 21 = f.select(:source_branch, @merge_request.source_project.repository.branch_names, { include_blank: "Select branch" }, {class: 'source_branch chosen span3'})
22 - .mr_source_commit.prepend-top-10 22 + .mr_source_commit.prepend-top-10
23 .span2 23 .span2
24 %h1.merge-request-angle 24 %h1.merge-request-angle
25 %i.icon-angle-right 25 %i.icon-angle-right
26 .span5 26 .span5
27 - .light-well  
28 - %h5.cgray To  
29 - - projects = @project.forked_from_project.nil? ? [@project] : [ @project,@project.forked_from_project]  
30 - .padded 27 + .ui-box
  28 + .title To
  29 + .ui-box-head
  30 + - projects = @project.forked_from_project.nil? ? [@project] : [ @project,@project.forked_from_project]
  31 + Project:
31 = f.select(:target_project_id, projects.map { |proj| [proj.path_with_namespace,proj.id] }, {include_blank: "Select Target Project" }, {class: 'target_project chosen span4'}) 32 = f.select(:target_project_id, projects.map { |proj| [proj.path_with_namespace,proj.id] }, {include_blank: "Select Target Project" }, {class: 'target_project chosen span4'})
32 .prepend-top-10 33 .prepend-top-10
33 %i.icon-code-fork 34 %i.icon-code-fork
34 -   35 + Branch:
35 = f.select(:target_branch, @target_branches, { include_blank: "Select branch" }, {class: 'target_branch chosen span3'}) 36 = f.select(:target_branch, @target_branches, { include_blank: "Select branch" }, {class: 'target_branch chosen span3'})
36 - .mr_target_commit.prepend-top-10 37 + .mr_target_commit.prepend-top-10
37 38
38 %hr 39 %hr
39 40
40 %h3.page-title 41 %h3.page-title
41 - %i.icon-paper-clip  
42 Details 42 Details
43 .merge-request-form-info 43 .merge-request-form-info
44 .control-group 44 .control-group