BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
e2e588d2
Commit
e2e588d2
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
021b6aef
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
2 deletions
+8
-2
blob_controller.rb
app/controllers/projects/blob_controller.rb
+2
-1
update_service.rb
app/services/files/update_service.rb
+1
-0
_editor.html.haml
app/views/projects/blob/_editor.html.haml
+5
-1
No files found.
app/controllers/projects/blob_controller.rb
View file @
e2e588d2
...
@@ -43,7 +43,8 @@ class Projects::BlobController < Projects::ApplicationController
...
@@ -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
)
+
diffs_namespace_project_merge_request_path
(
from_merge_request
.
target_project
.
namespace
,
from_merge_request
.
target_project
,
from_merge_request
)
+
"#file-path-
#{
hexdigest
(
@path
)
}
"
"#file-path-
#{
hexdigest
(
@path
)
}
"
else
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
end
create_commit
(
Files
::
UpdateService
,
success_path:
after_edit_path
,
create_commit
(
Files
::
UpdateService
,
success_path:
after_edit_path
,
...
...
app/services/files/update_service.rb
View file @
e2e588d2
...
@@ -3,6 +3,7 @@ require_relative "base_service"
...
@@ -3,6 +3,7 @@ require_relative "base_service"
module
Files
module
Files
class
UpdateService
<
Files
::
BaseService
class
UpdateService
<
Files
::
BaseService
def
commit
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
)
repository
.
commit_file
(
current_user
,
@file_path
,
@file_content
,
@commit_message
,
@target_branch
,
true
)
end
end
end
end
...
...
app/views/projects/blob/_editor.html.haml
View file @
e2e588d2
...
@@ -4,7 +4,11 @@
...
@@ -4,7 +4,11 @@
=
icon
(
'code-fork'
)
=
icon
(
'code-fork'
)
=
ref
=
ref
%span
.editor-file-name
%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
)
-
if
current_action?
(
:new
)
||
current_action?
(
:create
)
%span
.editor-file-name
%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