diff options
| author | Gerard Montemayor <gerard@dealgrocer.com> | 2018-09-13 20:38:11 +0800 |
|---|---|---|
| committer | Gerard Montemayor <gerard@dealgrocer.com> | 2018-09-13 20:41:48 +0800 |
| commit | 81978f938e6b27a28c62c3157addcfe3a0eaf52b (patch) | |
| tree | e3b618d516de418659c5f680fb2239f7a0b77051 | |
| parent | 71f3d48544cc0857c8d470b182f7e809de6a4642 (diff) | |
| download | gitlab-ce-81978f938e6b27a28c62c3157addcfe3a0eaf52b.tar.gz | |
Change .js-wip-explanation div element to span
| -rw-r--r-- | app/views/shared/issuable/form/_title.html.haml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-help-text-font-color-in-merge-request-creation.yml | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/views/shared/issuable/form/_title.html.haml b/app/views/shared/issuable/form/_title.html.haml index e49bdec386a..975c125e506 100644 --- a/app/views/shared/issuable/form/_title.html.haml +++ b/app/views/shared/issuable/form/_title.html.haml @@ -10,7 +10,7 @@ - if issuable.respond_to?(:work_in_progress?) %p.form-text.text-muted - .js-wip-explanation + %span.js-wip-explanation %a.js-toggle-wip{ href: '', tabindex: -1 } Remove the %code WIP: @@ -18,7 +18,7 @@ to allow this %strong Work In Progress merge request to be merged when it's ready. - .js-no-wip-explanation + %span.js-no-wip-explanation - if has_wip_commits It looks like you have some WIP commits in this branch. %br diff --git a/changelogs/unreleased/fix-help-text-font-color-in-merge-request-creation.yml b/changelogs/unreleased/fix-help-text-font-color-in-merge-request-creation.yml new file mode 100644 index 00000000000..4ac192cd056 --- /dev/null +++ b/changelogs/unreleased/fix-help-text-font-color-in-merge-request-creation.yml @@ -0,0 +1,5 @@ +--- +title: Fix wrong text color of help text in merge request creation +merge_request: +author: Gerard Montemayor +type: fixed |