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
4025c7f0
Commit
4025c7f0
authored
8 years ago
by
tiagonbotelho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes more issues for MR acceptance
parent
4deab9a5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
10 deletions
+8
-10
app/models/repository.rb
app/models/repository.rb
+8
-8
app/services/files/update_service.rb
app/services/files/update_service.rb
+0
-2
No files found.
app/models/repository.rb
View file @
4025c7f0
...
@@ -734,15 +734,15 @@ class Repository
...
@@ -734,15 +734,15 @@ class Repository
def
update_file
(
user
,
path
,
content
,
branch
:,
previous_path
:,
message
:)
def
update_file
(
user
,
path
,
content
,
branch
:,
previous_path
:,
message
:)
commit_with_hooks
(
user
,
branch
)
do
|
ref
|
commit_with_hooks
(
user
,
branch
)
do
|
ref
|
committer
=
user_to_committer
(
user
)
committer
=
user_to_committer
(
user
)
commit_
options
=
{}
options
=
{}
commit_
options
[
:committer
]
=
committer
options
[
:committer
]
=
committer
commit_
options
[
:author
]
=
committer
options
[
:author
]
=
committer
commit_
options
[
:commit
]
=
{
options
[
:commit
]
=
{
message:
options
[
:message
]
,
message:
message
,
branch:
ref
branch:
ref
}
}
commit_
options
[
:file
]
=
{
options
[
:file
]
=
{
content:
content
,
content:
content
,
path:
path
,
path:
path
,
update:
true
update:
true
...
@@ -750,9 +750,9 @@ class Repository
...
@@ -750,9 +750,9 @@ class Repository
if
previous_path
if
previous_path
options
[
:file
][
:previous_path
]
=
previous_path
options
[
:file
][
:previous_path
]
=
previous_path
Gitlab
::
Git
::
Blob
.
rename
(
raw_repository
,
commit_
options
)
Gitlab
::
Git
::
Blob
.
rename
(
raw_repository
,
options
)
else
else
Gitlab
::
Git
::
Blob
.
commit
(
raw_repository
,
commit_
options
)
Gitlab
::
Git
::
Blob
.
commit
(
raw_repository
,
options
)
end
end
end
end
end
end
...
...
This diff is collapsed.
Click to expand it.
app/services/files/update_service.rb
View file @
4025c7f0
...
@@ -7,8 +7,6 @@ module Files
...
@@ -7,8 +7,6 @@ module Files
branch:
@target_branch
,
branch:
@target_branch
,
previous_path:
@previous_path
,
previous_path:
@previous_path
,
message:
@commit_message
)
message:
@commit_message
)
end
end
end
end
end
end
This diff is collapsed.
Click to expand it.
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