diff options
| author | Mike Greiling <mike@pixelcog.com> | 2016-12-09 17:33:23 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2016-12-10 00:57:23 -0600 |
| commit | 730ff2e50b600f3e3c79e69fd4978faf6a06ce1b (patch) | |
| tree | 14bbf8d6ede864532918892df0a37caa1a095f62 | |
| parent | dccd53e1ce1903f2df8dd20023e2bafd96d850f3 (diff) | |
| download | gitlab-ce-19990-update-snippets-page-design.tar.gz | |
rename snippets_path helper due to conflict19990-update-snippets-page-design
| -rw-r--r-- | app/helpers/snippets_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/snippets/_snippets_scope_menu.html.haml | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/helpers/snippets_helper.rb b/app/helpers/snippets_helper.rb index fc7febd3385..8c02b4061ca 100644 --- a/app/helpers/snippets_helper.rb +++ b/app/helpers/snippets_helper.rb @@ -11,7 +11,7 @@ module SnippetsHelper # Return the path of a snippets index for a user or for a project # # @returns String, path to snippet index - def snippets_path(subject = nil, opts = nil) + def subject_snippets_path(subject = nil, opts = nil) if subject.is_a?(Project) namespace_project_snippets_path(subject.namespace, subject, opts) else # assume subject === User diff --git a/app/views/snippets/_snippets_scope_menu.html.haml b/app/views/snippets/_snippets_scope_menu.html.haml index cb837f1fac1..2dda5fed647 100644 --- a/app/views/snippets/_snippets_scope_menu.html.haml +++ b/app/views/snippets/_snippets_scope_menu.html.haml @@ -3,7 +3,7 @@ .nav-links.snippet-scope-menu %li{ class: ("active" unless params[:scope]) } - = link_to snippets_path(subject) do + = link_to subject_snippets_path(subject) do All %span.badge - if include_private @@ -13,19 +13,19 @@ - if include_private %li{ class: ("active" if params[:scope] == "are_private") } - = link_to snippets_path(subject, scope: 'are_private') do + = link_to subject_snippets_path(subject, scope: 'are_private') do Private %span.badge = subject.snippets.are_private.count %li{ class: ("active" if params[:scope] == "are_internal") } - = link_to snippets_path(subject, scope: 'are_internal') do + = link_to subject_snippets_path(subject, scope: 'are_internal') do Internal %span.badge = subject.snippets.are_internal.count %li{ class: ("active" if params[:scope] == "are_public") } - = link_to snippets_path(subject, scope: 'are_public') do + = link_to subject_snippets_path(subject, scope: 'are_public') do Public %span.badge = subject.snippets.are_public.count |