diff options
author | Phil Hughes <me@iamphill.com> | 2018-06-25 07:47:52 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-06-25 07:47:52 +0000 |
commit | 1d45ee71811c64b86a292b32bd68fe46a39d20b7 (patch) | |
tree | 4ac01777860c67829cb9b7ab1bf2f9a5d8165a05 | |
parent | 746499a78d8ff32a35b1ae0b758ce2a7bb67078f (diff) | |
parent | dc2c73accf9cddab8b2836bdbc9e66139f12ef3a (diff) | |
download | gitlab-ce-1d45ee71811c64b86a292b32bd68fe46a39d20b7.tar.gz |
Merge branch '47274-help-users-find-our-contributing-page' into 'master'
Resolve "Help users find our contributing page"
Closes #47274
See merge request gitlab-org/gitlab-ce!19708
3 files changed, 11 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 2fa71b23314..91a9b956d9d 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -527,7 +527,7 @@ .header-user { .dropdown-menu { width: auto; - min-width: 160px; + min-width: unset; margin-top: 4px; color: $gl-text-color; left: auto; diff --git a/app/views/layouts/header/_current_user_dropdown.html.haml b/app/views/layouts/header/_current_user_dropdown.html.haml index 24b6c490a5a..cdfd45fceb1 100644 --- a/app/views/layouts/header/_current_user_dropdown.html.haml +++ b/app/views/layouts/header/_current_user_dropdown.html.haml @@ -17,6 +17,11 @@ = link_to _("Help"), help_path - if current_user_menu?(:help) || current_user_menu?(:settings) || current_user_menu?(:profile) %li.divider + %li + = link_to "https://about.gitlab.com/contributing", target: '_blank', class: 'text-nowrap' do + = _("Contribute to GitLab") + = icon('external-link') + %li.divider - if current_user_menu?(:sign_out) %li = link_to _("Sign out"), destroy_user_session_path, class: "sign-out-link" diff --git a/changelogs/unreleased/47274-help-users-find-our-contributing-page.yml b/changelogs/unreleased/47274-help-users-find-our-contributing-page.yml new file mode 100644 index 00000000000..ed13c917a2e --- /dev/null +++ b/changelogs/unreleased/47274-help-users-find-our-contributing-page.yml @@ -0,0 +1,5 @@ +--- +title: Add a link to the contributing page in the user dropdown +merge_request: 19708 +author: +type: added |