diff options
| author | Mark Lapierre <mlapierre@gitlab.com> | 2019-06-18 03:33:13 +0000 |
|---|---|---|
| committer | Mark Lapierre <mlapierre@gitlab.com> | 2019-06-18 03:33:13 +0000 |
| commit | 8ac1ac2b9f1d070eb70bb21e0aa18b421836a48f (patch) | |
| tree | 6008878ddec05b44007cc77ed8f346c8573e81f3 /app | |
| parent | db9ef69272155b3c8ead5c0e7d027bda2b623d43 (diff) | |
| parent | 6cfab44a58331691f9af57b7c6ad41898e1dfabe (diff) | |
| download | gitlab-ce-8ac1ac2b9f1d070eb70bb21e0aa18b421836a48f.tar.gz | |
Merge branch 'qa-create-merge-request-tests' into 'master'
Fixing an old quarantined test
Closes gitlab-org/quality/staging#50
See merge request gitlab-org/gitlab-ce!28643
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/merge_requests/_mr_box.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/_mr_box.html.haml b/app/views/projects/merge_requests/_mr_box.html.haml index 7f2c9dcacfd..4f09f47d795 100644 --- a/app/views/projects/merge_requests/_mr_box.html.haml +++ b/app/views/projects/merge_requests/_mr_box.html.haml @@ -1,10 +1,10 @@ .detail-page-description - %h2.title + %h2.title.qa-title = markdown_field(@merge_request, :title) %div - if @merge_request.description.present? - .description{ class: can?(current_user, :update_merge_request, @merge_request) ? 'js-task-list-container' : '' } + .description.qa-description{ class: can?(current_user, :update_merge_request, @merge_request) ? 'js-task-list-container' : '' } .md = markdown_field(@merge_request, :description) %textarea.hidden.js-task-list-field |