summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-01-07 16:49:17 +0000
committerPhil Hughes <me@iamphill.com>2019-01-07 16:49:17 +0000
commitf309e1993a65946354f8bd8d834520100e179b3e (patch)
tree7cb2ab48dd8fef121ec730530510631899e5013e
parentcefa521e407b2276c2d5c4747d64a56aea02e0e4 (diff)
parent3f31b9f1695ad9dacd8c0ed309827cf6bec032d5 (diff)
downloadgitlab-ce-f309e1993a65946354f8bd8d834520100e179b3e.tar.gz
Merge branch '55192-about-link-in-new-window' into 'master'
Resolve ""About this feature" link should open in new window" Closes #55192 See merge request gitlab-org/gitlab-ce!24149
-rw-r--r--app/views/shared/issuable/form/_merge_params.html.haml2
-rw-r--r--changelogs/unreleased/55192-about-link-in-new-window.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/shared/issuable/form/_merge_params.html.haml b/app/views/shared/issuable/form/_merge_params.html.haml
index 1881875b7c0..ca3141b2cc3 100644
--- a/app/views/shared/issuable/form/_merge_params.html.haml
+++ b/app/views/shared/issuable/form/_merge_params.html.haml
@@ -19,4 +19,4 @@
= check_box_tag 'merge_request[squash]', '1', issuable.squash, class: 'form-check-input'
= label_tag 'merge_request[squash]', class: 'form-check-label' do
Squash commits when merge request is accepted.
- = link_to 'About this feature', help_page_path('user/project/merge_requests/squash_and_merge')
+ = link_to icon('question-circle'), help_page_path('user/project/merge_requests/squash_and_merge'), target: '_blank'
diff --git a/changelogs/unreleased/55192-about-link-in-new-window.yml b/changelogs/unreleased/55192-about-link-in-new-window.yml
new file mode 100644
index 00000000000..b686150942b
--- /dev/null
+++ b/changelogs/unreleased/55192-about-link-in-new-window.yml
@@ -0,0 +1,5 @@
+---
+title: Resolve About this feature link should open in new window
+merge_request: 24149
+author:
+type: fixed