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
c71254ff
Commit
c71254ff
authored
Jul 04, 2016
by
tiagonbotelho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
creates the update_file method in repository.rb and applies changes accordingly
parent
a01facc8
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
0 deletions
+16
-0
repository.rb
app/models/repository.rb
+16
-0
No files found.
app/models/repository.rb
View file @
c71254ff
...
...
@@ -749,15 +749,31 @@ class Repository
options
[
:author
]
=
committer
options
[
:commit
]
=
{
message:
message
,
<<<<<<<
3824
e8e1c4315bb3d1b2c1389f442d3b5e94f945
branch:
ref
}
=======
branch:
ref
,
}
if
previous_path
options
[
:file
]
=
{
path:
previous_path
}
Gitlab
::
Git
::
Blob
.
remove
(
raw_repository
,
options
)
end
>>>>>>>
creates
the
update_file
method
in
repository
.
rb
and
applies
changes
accordingly
options
[
:file
]
=
{
content:
content
,
path:
path
,
update:
update
}
<<<<<<<
3824
e8e1c4315bb3d1b2c1389f442d3b5e94f945
if
previous_path
options
[
:file
].
merge!
(
previous_path:
previous_path
)
...
...
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