diff options
| author | Phil Hughes <me@iamphill.com> | 2018-07-06 07:58:49 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-07-06 07:58:49 +0000 |
| commit | a29124bf9f15028b6eaf9aa5ca86cc963528c9cf (patch) | |
| tree | 115e95d64689c84ed4ec27231b9807d260b88a47 | |
| parent | 19e85cc8109b4d1c025b264c04f577d3b5d2be2e (diff) | |
| parent | d06b366486aeeefae6ad2410e446941cdf6a9795 (diff) | |
| download | gitlab-ce-a29124bf9f15028b6eaf9aa5ca86cc963528c9cf.tar.gz | |
Merge branch 'move-contributing-link-to-partial-for-ee-exclusion' into 'master'
CE for "Remove new contributing link from EE"
See merge request gitlab-org/gitlab-ce!20334
| -rw-r--r-- | app/views/layouts/header/_current_user_dropdown.html.haml | 6 | ||||
| -rw-r--r-- | app/views/shared/_user_dropdown_contributing_link.html.haml | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/app/views/layouts/header/_current_user_dropdown.html.haml b/app/views/layouts/header/_current_user_dropdown.html.haml index a74ea246eaf..9ed05d6e3d0 100644 --- a/app/views/layouts/header/_current_user_dropdown.html.haml +++ b/app/views/layouts/header/_current_user_dropdown.html.haml @@ -17,11 +17,7 @@ = 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") - = sprite_icon('external-link', size: 16) - %li.divider + = render 'shared/user_dropdown_contributing_link' - if current_user_menu?(:sign_out) %li = link_to _("Sign out"), destroy_user_session_path, class: "sign-out-link" diff --git a/app/views/shared/_user_dropdown_contributing_link.html.haml b/app/views/shared/_user_dropdown_contributing_link.html.haml new file mode 100644 index 00000000000..333d6fa3489 --- /dev/null +++ b/app/views/shared/_user_dropdown_contributing_link.html.haml @@ -0,0 +1,5 @@ +%li + = link_to "https://about.gitlab.com/contributing", target: '_blank', class: 'text-nowrap' do + = _("Contribute to GitLab") + = sprite_icon('external-link', size: 16) +%li.divider |