diff options
| author | Phil Hughes <me@iamphill.com> | 2017-03-07 11:40:27 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-03-07 11:40:27 +0000 |
| commit | 12fe94c388ae9ec73e34852ef7d7b90f2f347df7 (patch) | |
| tree | 5182f89deddf9428b1d6ca70720f8ac8ee2b940a /app/views/layouts | |
| parent | 002d3a3e72de57c76a077ed5d09e857243c7effd (diff) | |
| parent | ac9d792946deb17a402646e5481087e4d92f88ad (diff) | |
| download | gitlab-ce-12fe94c388ae9ec73e34852ef7d7b90f2f347df7.tar.gz | |
Merge branch 'master' into 26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pages26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pages
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/_init_auto_complete.html.haml | 1 | ||||
| -rw-r--r-- | app/views/layouts/nav/_project.html.haml | 20 |
2 files changed, 16 insertions, 5 deletions
diff --git a/app/views/layouts/_init_auto_complete.html.haml b/app/views/layouts/_init_auto_complete.html.haml index 3daa1e90a8c..769f6fb0151 100644 --- a/app/views/layouts/_init_auto_complete.html.haml +++ b/app/views/layouts/_init_auto_complete.html.haml @@ -4,7 +4,6 @@ - if project :javascript gl.GfmAutoComplete.dataSources = { - emojis: "#{emojis_namespace_project_autocomplete_sources_path(project.namespace, project)}", members: "#{members_namespace_project_autocomplete_sources_path(project.namespace, project, type: noteable_type, type_id: params[:id])}", issues: "#{issues_namespace_project_autocomplete_sources_path(project.namespace, project)}", mergeRequests: "#{merge_requests_namespace_project_autocomplete_sources_path(project.namespace, project)}", diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml index 2335d467389..f351e7feac9 100644 --- a/app/views/layouts/nav/_project.html.haml +++ b/app/views/layouts/nav/_project.html.haml @@ -71,18 +71,30 @@ %span Snippets - -# Global shortcut to network page for compatibility + -# Shortcut to Project > Activity + %li.hidden + = link_to activity_project_path(@project), title: 'Activity', class: 'shortcuts-project-activity' do + %span + Activity + + -# Shortcut to Repository > Graph (formerly, Network) - if project_nav_tab? :network %li.hidden = link_to namespace_project_network_path(@project.namespace, @project, current_ref), title: 'Network', class: 'shortcuts-network' do - Network + Graph + + -# Shortcut to Repository > Charts (formerly, top-nav item "Graphs") + - unless @project.empty_repo? + %li.hidden + = link_to charts_namespace_project_graph_path(@project.namespace, @project, current_ref), title: 'Charts', class: 'shortcuts-repository-charts' do + Charts - -# Shortcut to create a new issue + -# Shortcut to Issues > New Issue %li.hidden = link_to new_namespace_project_issue_path(@project.namespace, @project), class: 'shortcuts-new-issue' do Create a new issue - -# Shortcut to builds page + -# Shortcut to Pipelines > Jobs - if project_nav_tab? :builds %li.hidden = link_to project_builds_path(@project), title: 'Jobs', class: 'shortcuts-builds' do |