diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-12-22 06:47:54 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-12-22 06:47:54 +0000 |
commit | 4423b299b73e2b96b980b848fab5cf374361572b (patch) | |
tree | 8f2c7b12b3c267efda53918f67210225fac017ff /app/views/projects/tree/_old_tree_header.html.haml | |
parent | 0b5947849a32991904f8cbc5e4612d2438b97e0b (diff) | |
parent | 36f4710301926bb853b35d9b14a60e03b42def34 (diff) | |
download | gitlab-ce-4423b299b73e2b96b980b848fab5cf374361572b.tar.gz |
Merge branch 'master' into 22643-manual-job-page
* master: (68 commits)
Last push event widget width for fixed layout
Added 'admin' persona
Docs: move article Artifactory + GL to subject-related folder
Mention GitLab Pages when changing username
Consolidate the docs when changing a repo path
Add docs for automatic redirects when renaming namespaces
move "Transfer an existing project into a group" to project docs
Do not show Vue pagination if only one page
Resolve "Decouple multi-file editor from file list"
Update Ruby version to 2.3.6
Skip projects filter on merge requests search
Fall back to the `MergeRequestWidgetEntity`
LDAP extern_uids are not normalized when updated via API
organise content by subject
Restore missing language code in datetime_utility.js
Add support for defining explicit dependencies to QA factories
Document mounting volumes with Docker-in-Docker
add missing word to pawel-reduce_cardinality_of_prometheus_metrics.yml
Use seconds where possible, and convert to milliseconds for Influxdb consumption
update dispatcher to allow for dynamic imports until webpack plugin is updated
...
Diffstat (limited to 'app/views/projects/tree/_old_tree_header.html.haml')
-rw-r--r-- | app/views/projects/tree/_old_tree_header.html.haml | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/app/views/projects/tree/_old_tree_header.html.haml b/app/views/projects/tree/_old_tree_header.html.haml deleted file mode 100644 index 7f636b7e0e8..00000000000 --- a/app/views/projects/tree/_old_tree_header.html.haml +++ /dev/null @@ -1,64 +0,0 @@ -- if on_top_of_branch? - - addtotree_toggle_attributes = { href: '#', 'data-toggle': 'dropdown', 'data-target': '.add-to-tree-dropdown' } -- else - - addtotree_toggle_attributes = { title: _("You can only add files when you are on a branch"), data: { container: 'body' }, class: 'disabled has-tooltip' } - -%ul.breadcrumb.repo-breadcrumb - %li - = link_to project_tree_path(@project, @ref) do - = @project.path - - path_breadcrumbs do |title, path| - %li - = link_to truncate(title, length: 40), project_tree_path(@project, tree_join(@ref, path)) - - - if current_user - %li - %a.btn.add-to-tree{ addtotree_toggle_attributes } - = sprite_icon('plus', size: 16, css_class: 'pull-left') - = sprite_icon('arrow-down', size: 16, css_class: 'pull-left') - - if on_top_of_branch? - .add-to-tree-dropdown - %ul.dropdown-menu - - if can_edit_tree? - %li - = link_to project_new_blob_path(@project, @id) do - #{ _('New file') } - %li - = link_to '#modal-upload-blob', { 'data-target' => '#modal-upload-blob', 'data-toggle' => 'modal' } do - #{ _('Upload file') } - %li - = link_to '#modal-create-new-dir', { 'data-target' => '#modal-create-new-dir', 'data-toggle' => 'modal' } do - #{ _('New directory') } - - elsif can?(current_user, :fork_project, @project) - %li - - continue_params = { to: project_new_blob_path(@project, @id), - notice: edit_in_new_fork_notice, - notice_now: edit_in_new_fork_notice_now } - - fork_path = project_forks_path(@project, namespace_key: current_user.namespace.id, - continue: continue_params) - = link_to fork_path, method: :post do - #{ _('New file') } - %li - - continue_params = { to: request.fullpath, - notice: edit_in_new_fork_notice + " Try to upload a file again.", - notice_now: edit_in_new_fork_notice_now } - - fork_path = project_forks_path(@project, namespace_key: current_user.namespace.id, - continue: continue_params) - = link_to fork_path, method: :post do - #{ _('Upload file') } - %li - - continue_params = { to: request.fullpath, - notice: edit_in_new_fork_notice + " Try to create a new directory again.", - notice_now: edit_in_new_fork_notice_now } - - fork_path = project_forks_path(@project, namespace_key: current_user.namespace.id, - continue: continue_params) - = link_to fork_path, method: :post do - #{ _('New directory') } - - %li.divider - %li - = link_to new_project_branch_path(@project) do - #{ _('New branch') } - %li - = link_to new_project_tag_path(@project) do - #{ _('New tag') } |