summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKushal Pandya <kushalspandya@gmail.com>2019-01-04 12:01:16 +0000
committerKushal Pandya <kushalspandya@gmail.com>2019-01-04 12:01:16 +0000
commit6d99475ad206521e69c7cea6c8e868ce7d568871 (patch)
tree96daecc577227d4e44e58f725846967effbe0123
parent08bc9d5e9a204010fd3880366d8ee8c8e41f58c3 (diff)
parent3948dd4ac3c43ae70a34f72c4bd0d6fdbae68fb0 (diff)
downloadgitlab-ce-6d99475ad206521e69c7cea6c8e868ce7d568871.tar.gz
Merge branch '43623-add-submit-feedback-in-product-feedback-link' into 'master'
Resolve "Add "Submit feedback" in-product feedback link" Closes #43623 See merge request gitlab-org/gitlab-ce!23547
-rw-r--r--app/views/layouts/header/_help_dropdown.html.haml3
-rw-r--r--changelogs/unreleased/43623-add-submit-feedback-in-product-feedback-link.yml5
-rw-r--r--locale/gitlab.pot3
3 files changed, 11 insertions, 0 deletions
diff --git a/app/views/layouts/header/_help_dropdown.html.haml b/app/views/layouts/header/_help_dropdown.html.haml
index 953c0e7f46c..04409408ce0 100644
--- a/app/views/layouts/header/_help_dropdown.html.haml
+++ b/app/views/layouts/header/_help_dropdown.html.haml
@@ -2,5 +2,8 @@
- if current_user_menu?(:help)
%li
= link_to _("Help"), help_path
+ %li.divider
+ %li
+ = link_to _("Submit feedback"), "https://about.gitlab.com/submit-feedback"
- if current_user_menu?(:help) || current_user_menu?(:settings) || current_user_menu?(:profile)
= render 'shared/user_dropdown_contributing_link'
diff --git a/changelogs/unreleased/43623-add-submit-feedback-in-product-feedback-link.yml b/changelogs/unreleased/43623-add-submit-feedback-in-product-feedback-link.yml
new file mode 100644
index 00000000000..f5d99e9a448
--- /dev/null
+++ b/changelogs/unreleased/43623-add-submit-feedback-in-product-feedback-link.yml
@@ -0,0 +1,5 @@
+---
+title: Add submit feedback link to help dropdown
+merge_request: 23547
+author:
+type: added
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 10a3a70b32a..7a43add9005 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -6422,6 +6422,9 @@ msgstr ""
msgid "Submit as spam"
msgstr ""
+msgid "Submit feedback"
+msgstr ""
+
msgid "Submit search"
msgstr ""