diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-05-04 08:09:21 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-05-04 08:09:21 +0000 |
| commit | b64a37c4ed5561d423ee607f9821b75fd0337168 (patch) | |
| tree | 7b10e0e1938f871a2a228fe38adf3641ef6f5ce5 /app/views/projects/issues/show.html.haml | |
| parent | 8983ade27df200f7f9376d61de17f329d9d27a33 (diff) | |
| download | gitlab-ce-b64a37c4ed5561d423ee607f9821b75fd0337168.tar.gz | |
Allow to create new branch and empty WIP merge request from issue page
Diffstat (limited to 'app/views/projects/issues/show.html.haml')
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index 2a871966aa8..1418ad73553 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -70,8 +70,11 @@ // This element is filled in using JavaScript. .content-block.content-block-small - = render 'new_branch' unless @issue.confidential? - = render 'award_emoji/awards_block', awardable: @issue, inline: true + .row + .col-sm-6 + = render 'award_emoji/awards_block', awardable: @issue, inline: true + .col-sm-6.new-branch-col + = render 'new_branch' unless @issue.confidential? %section.issuable-discussion = render 'projects/issues/discussion' |