Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
b34310ae
Commit
b34310ae
authored
Jul 01, 2016
by
tiagonbotelho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
implements the form for renaming the new filename on the file edit page
parent
850bb6db
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
2 deletions
+8
-2
app/controllers/projects/blob_controller.rb
app/controllers/projects/blob_controller.rb
+2
-1
app/services/files/update_service.rb
app/services/files/update_service.rb
+1
-0
app/views/projects/blob/_editor.html.haml
app/views/projects/blob/_editor.html.haml
+5
-1
No files found.
app/controllers/projects/blob_controller.rb
View file @
b34310ae
...
...
@@ -43,7 +43,8 @@ class Projects::BlobController < Projects::ApplicationController
diffs_namespace_project_merge_request_path
(
from_merge_request
.
target_project
.
namespace
,
from_merge_request
.
target_project
,
from_merge_request
)
+
"#file-path-
#{
hexdigest
(
@path
)
}
"
else
namespace_project_blob_path
(
@project
.
namespace
,
@project
,
File
.
join
(
@target_branch
,
@path
))
# params[:file_name] stores the new name for the file
namespace_project_blob_path
(
@project
.
namespace
,
@project
,
File
.
join
(
@target_branch
,
params
[
:file_name
]))
end
create_commit
(
Files
::
UpdateService
,
success_path:
after_edit_path
,
...
...
app/services/files/update_service.rb
View file @
b34310ae
...
...
@@ -3,6 +3,7 @@ require_relative "base_service"
module
Files
class
UpdateService
<
Files
::
BaseService
def
commit
# Need to update file_path with the new filename
repository
.
commit_file
(
current_user
,
@file_path
,
@file_content
,
@commit_message
,
@target_branch
,
true
)
end
end
...
...
app/views/projects/blob/_editor.html.haml
View file @
b34310ae
...
...
@@ -4,7 +4,11 @@
=
icon
(
'code-fork'
)
=
ref
%span
.editor-file-name
=
@path
-
if
current_action?
(
:edit
)
&&
can?
(
current_user
,
:push_code
,
@project
)
=
text_field_tag
'file_name'
,
params
[
:file_name
],
placeholder:
@path
,
class:
'form-control new-file-name'
-
else
=
@path
-
if
current_action?
(
:new
)
||
current_action?
(
:create
)
%span
.editor-file-name
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment