Move assignee/milestone below description of Issue

Signed-off-by: 's avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 83d35399
......@@ -29,20 +29,21 @@
line-height: 1.5;
margin: 0;
color: #333;
padding-bottom: 0;
padding: 15px 25px;
}
.context {
border: none;
border-top: 1px solid #eee;
padding: 15px 25px;
}
.description {
border-top: 1px solid #eee;
padding: 0 25px 15px 25px;
}
.title, .context, .description {
padding: 15px 25px;
.clearfix {
margin: 0;
}
......
......@@ -42,15 +42,15 @@
%h4.title
= gfm escape_once(@issue.title)
.context
%cite.cgray
= render partial: 'issue_context', locals: { issue: @issue }
- if @issue.description.present?
.description
.wiki
= preserve do
= markdown @issue.description
.context
%cite.cgray
= render partial: 'issue_context', locals: { issue: @issue }
- content_for :note_actions do
- if can?(current_user, :modify_issue, @issue)
......
......@@ -15,16 +15,16 @@
%h4.title
= gfm escape_once(@merge_request.title)
.context
%cite.cgray
= render partial: 'projects/merge_requests/show/context', locals: { merge_request: @merge_request }
- if @merge_request.description.present?
.description
.wiki
= preserve do
= markdown @merge_request.description
.context
%cite.cgray
= render partial: 'projects/merge_requests/show/context', locals: { merge_request: @merge_request }
- if @merge_request.closed?
.alert.alert-info
%span
......
......@@ -55,7 +55,9 @@ class ProjectMergeRequests < Spinach::FeatureSteps
end
step 'I click link "Close"' do
click_link "Close"
within '.page-title' do
click_link "Close"
end
end
step 'I submit new merge request "Wiki Feature"' do
......@@ -163,7 +165,7 @@ class ProjectMergeRequests < Spinach::FeatureSteps
end
step 'I should see merged request' do
within '.page-title' do
within '.issue-box' do
page.should have_content "Merged"
end
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment