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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
58031cad
Commit
58031cad
authored
Jul 06, 2016
by
tiagonbotelho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactors to pass values as arguments through options
parent
7503dc7f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
15 deletions
+17
-15
app/models/repository.rb
app/models/repository.rb
+14
-13
app/services/files/update_service.rb
app/services/files/update_service.rb
+3
-2
No files found.
app/models/repository.rb
View file @
58031cad
...
...
@@ -731,29 +731,30 @@ class Repository
end
end
def
update_file
(
user
,
path
,
previous_path
,
content
,
message
,
branch
,
update
)
# previous_path, message, update
def
update_file
(
user
,
path
,
content
,
branch
,
options
=
{})
commit_with_hooks
(
user
,
branch
)
do
|
ref
|
committer
=
user_to_committer
(
user
)
options
=
{}
options
[
:committer
]
=
committer
options
[
:author
]
=
committer
options
[
:commit
]
=
{
message:
message
,
branch:
ref
,
commit_
options
=
{}
commit_
options
[
:committer
]
=
committer
commit_
options
[
:author
]
=
committer
commit_
options
[
:commit
]
=
{
message:
options
[
:message
]
,
branch:
ref
}
options
[
:file
]
=
{
commit_
options
[
:file
]
=
{
content:
content
,
path:
path
,
update:
update
update:
options
[
:update
]
}
if
previous_path
options
[
:file
].
merge!
(
previous_path:
previous_path
)
if
options
[
:previous_path
]
commit_options
[
:file
].
merge!
(
previous_path:
options
[
:previous_path
]
)
Gitlab
::
Git
::
Blob
.
rename
(
raw_repository
,
options
)
Gitlab
::
Git
::
Blob
.
rename
(
raw_repository
,
commit_
options
)
else
Gitlab
::
Git
::
Blob
.
commit
(
raw_repository
,
options
)
Gitlab
::
Git
::
Blob
.
commit
(
raw_repository
,
commit_
options
)
end
end
end
...
...
app/services/files/update_service.rb
View file @
58031cad
...
...
@@ -3,8 +3,9 @@ require_relative "base_service"
module
Files
class
UpdateService
<
Files
::
BaseService
def
commit
repository
.
update_file
(
current_user
,
@file_path
,
@previous_path
,
@file_content
,
@commit_message
,
@target_branch
,
true
)
repository
.
update_file
(
current_user
,
@file_path
,
@file_content
,
@target_branch
,
previous_path:
@previous_path
,
message:
@commit_message
,
update:
true
)
end
end
end
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