Download as
Browse Code »

Commit ee750298675f0beed94688a9798d3e0b8362b455

Authored by Dmitriy Zaporozhets
1 parent 83d35399
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Move assignee/milestone below description of Issue 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 4 changed files with 16 additions and 13 deletions   Show diff stats
app/assets/stylesheets/generic/issue_box.scss
  Diff comments   View file @ee75029
@@ -29,20 +29,21 @@ @@ -29,20 +29,21 @@
29 line-height: 1.5; 29 line-height: 1.5;
30 margin: 0; 30 margin: 0;
31 color: #333; 31 color: #333;
  32 + padding-bottom: 0;
  33 + padding: 15px 25px;
32 } 34 }
33 35
34 .context { 36 .context {
35 border: none; 37 border: none;
36 border-top: 1px solid #eee; 38 border-top: 1px solid #eee;
  39 + padding: 15px 25px;
37 } 40 }
38 41
39 .description { 42 .description {
40 - border-top: 1px solid #eee; 43 + padding: 0 25px 15px 25px;
41 } 44 }
42 45
43 .title, .context, .description { 46 .title, .context, .description {
44 - padding: 15px 25px;  
45 -  
46 .clearfix { 47 .clearfix {
47 margin: 0; 48 margin: 0;
48 } 49 }
app/views/projects/issues/show.html.haml
  Diff comments   View file @ee75029
@@ -42,15 +42,15 @@ @@ -42,15 +42,15 @@
42 %h4.title 42 %h4.title
43 = gfm escape_once(@issue.title) 43 = gfm escape_once(@issue.title)
44 44
45 - .context  
46 - %cite.cgray  
47 - = render partial: 'issue_context', locals: { issue: @issue }  
48 -  
49 - if @issue.description.present? 45 - if @issue.description.present?
50 .description 46 .description
51 .wiki 47 .wiki
52 = preserve do 48 = preserve do
53 = markdown @issue.description 49 = markdown @issue.description
  50 + .context
  51 + %cite.cgray
  52 + = render partial: 'issue_context', locals: { issue: @issue }
  53 +
54 54
55 - content_for :note_actions do 55 - content_for :note_actions do
56 - if can?(current_user, :modify_issue, @issue) 56 - if can?(current_user, :modify_issue, @issue)
app/views/projects/merge_requests/show/_mr_box.html.haml
  Diff comments   View file @ee75029
@@ -15,16 +15,16 @@ @@ -15,16 +15,16 @@
15 %h4.title 15 %h4.title
16 = gfm escape_once(@merge_request.title) 16 = gfm escape_once(@merge_request.title)
17 17
18 - .context  
19 - %cite.cgray  
20 - = render partial: 'projects/merge_requests/show/context', locals: { merge_request: @merge_request }  
21 -  
22 - if @merge_request.description.present? 18 - if @merge_request.description.present?
23 .description 19 .description
24 .wiki 20 .wiki
25 = preserve do 21 = preserve do
26 = markdown @merge_request.description 22 = markdown @merge_request.description
27 23
  24 + .context
  25 + %cite.cgray
  26 + = render partial: 'projects/merge_requests/show/context', locals: { merge_request: @merge_request }
  27 +
28 - if @merge_request.closed? 28 - if @merge_request.closed?
29 .alert.alert-info 29 .alert.alert-info
30 %span 30 %span
features/steps/project/project_merge_requests.rb
  Diff comments   View file @ee75029
@@ -55,7 +55,9 @@ class ProjectMergeRequests &lt; Spinach::FeatureSteps @@ -55,7 +55,9 @@ class ProjectMergeRequests &lt; Spinach::FeatureSteps
55 end 55 end
56 56
57 step 'I click link "Close"' do 57 step 'I click link "Close"' do
58 - click_link "Close" 58 + within '.page-title' do
  59 + click_link "Close"
  60 + end
59 end 61 end
60 62
61 step 'I submit new merge request "Wiki Feature"' do 63 step 'I submit new merge request "Wiki Feature"' do
@@ -163,7 +165,7 @@ class ProjectMergeRequests &lt; Spinach::FeatureSteps @@ -163,7 +165,7 @@ class ProjectMergeRequests &lt; Spinach::FeatureSteps
163 end 165 end
164 166
165 step 'I should see merged request' do 167 step 'I should see merged request' do
166 - within '.page-title' do 168 + within '.issue-box' do
167 page.should have_content "Merged" 169 page.should have_content "Merged"
168 end 170 end
169 end 171 end