Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-07-19 18:37:39 +0300
committerDouwe Maan <douwe@gitlab.com>2016-07-19 18:37:39 +0300
commit81e57e783e8882de21d27d9191c09404ed7faca3 (patch)
treee7c86ebcd9a2cc696901a01df3aff9d899cb8441 /app/views/projects
parente953b8afd2efe042c72ec8be2b9ad35ee04f8723 (diff)
parentff059360587f61907fb0a2691984ddd05fe049b9 (diff)
Merge branch 'rename-repo-files' into 'master'
Implements the form for renaming the new filename on the file edit page ## What does this MR do? Adds the possibility to edit a filename when editing the content of a file on Gitlab this MR was made to solve #5850 ![Screen_Shot_2016-07-01_at_16.45.53](/uploads/eeed05800e3dc11f1e3840e0e4fa06b5/Screen_Shot_2016-07-01_at_16.45.53.png) See merge request !5049
Diffstat (limited to 'app/views/projects')
-rw-r--r--app/views/projects/blob/_editor.html.haml4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml
index 29c7d45074a..ff379bafb26 100644
--- a/app/views/projects/blob/_editor.html.haml
+++ b/app/views/projects/blob/_editor.html.haml
@@ -4,7 +4,9 @@
= icon('code-fork')
= ref
%span.editor-file-name
- = @path
+ - if current_action?(:edit) || current_action?(:update)
+ = text_field_tag 'file_path', (params[:file_path] || @path),
+ class: 'form-control new-file-path'
- if current_action?(:new) || current_action?(:create)
%span.editor-file-name