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
Kazuhiko Shiozaki
gitlab-ce
Commits
a516a846
Commit
a516a846
authored
11 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/edit_file_api' of /home/git/repositories/gitlab/gitlabhq
parents
75303241
986697a9
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
94 additions
and
25 deletions
+94
-25
app/contexts/files/create_context.rb
app/contexts/files/create_context.rb
+2
-3
app/contexts/files/update_context.rb
app/contexts/files/update_context.rb
+1
-2
doc/api/repositories.md
doc/api/repositories.md
+13
-0
lib/api/files.rb
lib/api/files.rb
+34
-2
lib/gitlab/satellite/files/edit_file_action.rb
lib/gitlab/satellite/files/edit_file_action.rb
+1
-3
lib/gitlab/satellite/files/file_action.rb
lib/gitlab/satellite/files/file_action.rb
+0
-7
lib/gitlab/satellite/files/new_file_action.rb
lib/gitlab/satellite/files/new_file_action.rb
+2
-2
spec/requests/api/files_spec.rb
spec/requests/api/files_spec.rb
+41
-6
No files found.
app/contexts/files/create_context.rb
View file @
a516a846
...
...
@@ -33,11 +33,10 @@ module Files
return
error
(
"Your changes could not be commited, because file with such name exists"
)
end
new_file_action
=
Gitlab
::
Satellite
::
NewFileAction
.
new
(
current_user
,
project
,
ref
,
path
)
new_file_action
=
Gitlab
::
Satellite
::
NewFileAction
.
new
(
current_user
,
project
,
ref
,
file_
path
)
created_successfully
=
new_file_action
.
commit!
(
params
[
:content
],
params
[
:commit_message
],
file_name
,
params
[
:commit_message
]
)
if
created_successfully
...
...
This diff is collapsed.
Click to expand it.
app/contexts/files/update_context.rb
View file @
a516a846
...
...
@@ -24,8 +24,7 @@ module Files
new_file_action
=
Gitlab
::
Satellite
::
EditFileAction
.
new
(
current_user
,
project
,
ref
,
path
)
created_successfully
=
new_file_action
.
commit!
(
params
[
:content
],
params
[
:commit_message
],
params
[
:last_commit
]
params
[
:commit_message
]
)
if
created_successfully
...
...
This diff is collapsed.
Click to expand it.
doc/api/repositories.md
View file @
a516a846
...
...
@@ -384,3 +384,16 @@ Parameters:
+
`branch_name`
(required) - The name of branch
+
`content`
(required) - File content
+
`commit_message`
(required) - Commit message
## Update existing file in repository
```
PUT /projects/:id/repository/files
```
Parameters:
+
`file_path`
(required) - Full path to file. Ex. lib/class.rb
+
`branch_name`
(required) - The name of branch
+
`content`
(required) - New file content
+
`commit_message`
(required) - Commit message
This diff is collapsed.
Click to expand it.
lib/api/files.rb
View file @
a516a846
...
...
@@ -16,9 +16,10 @@ module API
#
# Example Request:
# POST /projects/:id/repository/files
#
post
":id/repository/files"
do
required_attributes!
[
:file_name
,
:branch_name
,
:content
]
attrs
=
attributes_for_keys
[
:file_name
,
:file_path
,
:branch_name
,
:content
]
required_attributes!
[
:file_name
,
:branch_name
,
:content
,
:commit_message
]
attrs
=
attributes_for_keys
[
:file_name
,
:file_path
,
:branch_name
,
:content
,
:commit_message
]
branch_name
=
attrs
.
delete
(
:branch_name
)
file_path
=
attrs
.
delete
(
:file_path
)
result
=
::
Files
::
CreateContext
.
new
(
user_project
,
current_user
,
attrs
,
branch_name
,
file_path
).
execute
...
...
@@ -35,6 +36,37 @@ module API
render_api_error!
(
result
[
:error
],
400
)
end
end
# Update existing file in repository
#
# Parameters:
# file_name (required) - The name of new file. Ex. class.rb
# file_path (optional) - The path to new file. Ex. lib/
# branch_name (required) - The name of branch
# content (required) - File content
# commit_message (required) - Commit message
#
# Example Request:
# PUT /projects/:id/repository/files
#
put
":id/repository/files"
do
required_attributes!
[
:file_path
,
:branch_name
,
:content
,
:commit_message
]
attrs
=
attributes_for_keys
[
:file_path
,
:branch_name
,
:content
,
:commit_message
]
branch_name
=
attrs
.
delete
(
:branch_name
)
file_path
=
attrs
.
delete
(
:file_path
)
result
=
::
Files
::
UpdateContext
.
new
(
user_project
,
current_user
,
attrs
,
branch_name
,
file_path
).
execute
if
result
[
:status
]
==
:success
status
(
200
)
{
file_path:
file_path
,
branch_name:
branch_name
}
else
render_api_error!
(
result
[
:error
],
400
)
end
end
end
end
end
...
...
This diff is collapsed.
Click to expand it.
lib/gitlab/satellite/files/edit_file_action.rb
View file @
a516a846
...
...
@@ -10,9 +10,7 @@ module Gitlab
# Returns false if committing the change fails
# Returns false if pushing from the satellite to Gitolite failed or was rejected
# Returns true otherwise
def
commit!
(
content
,
commit_message
,
last_commit
)
return
false
unless
can_edit?
(
last_commit
)
def
commit!
(
content
,
commit_message
)
in_locked_and_timed_satellite
do
|
repo
|
prepare_satellite!
(
repo
)
...
...
This diff is collapsed.
Click to expand it.
lib/gitlab/satellite/files/file_action.rb
View file @
a516a846
...
...
@@ -8,13 +8,6 @@ module Gitlab
@file_path
=
file_path
@ref
=
ref
end
protected
def
can_edit?
(
last_commit
)
current_last_commit
=
Gitlab
::
Git
::
Commit
.
last_for_path
(
@project
.
repository
,
ref
,
file_path
).
sha
last_commit
==
current_last_commit
end
end
end
end
This diff is collapsed.
Click to expand it.
lib/gitlab/satellite/files/new_file_action.rb
View file @
a516a846
...
...
@@ -9,7 +9,7 @@ module Gitlab
# Returns false if committing the change fails
# Returns false if pushing from the satellite to Gitolite failed or was rejected
# Returns true otherwise
def
commit!
(
content
,
commit_message
,
file_name
)
def
commit!
(
content
,
commit_message
)
in_locked_and_timed_satellite
do
|
repo
|
prepare_satellite!
(
repo
)
...
...
@@ -17,7 +17,7 @@ module Gitlab
repo
.
git
.
checkout
({
raise:
true
,
timeout:
true
,
b:
true
},
ref
,
"origin/
#{
ref
}
"
)
# update the file in the satellite's working dir
file_path_in_satellite
=
File
.
join
(
repo
.
working_dir
,
file_path
||
''
,
file_name
)
file_path_in_satellite
=
File
.
join
(
repo
.
working_dir
,
file_path
)
File
.
open
(
file_path_in_satellite
,
'w'
)
{
|
f
|
f
.
write
(
content
)
}
# add new file
...
...
This diff is collapsed.
Click to expand it.
spec/requests/api/files_spec.rb
View file @
a516a846
...
...
@@ -10,6 +10,15 @@ describe API::API do
before
{
project
.
team
<<
[
user
,
:developer
]
}
describe
"POST /projects/:id/repository/files"
do
let
(
:valid_params
)
{
{
file_name:
'newfile.rb'
,
branch_name:
'master'
,
content:
'puts 8'
,
commit_message:
'Added newfile'
}
}
it
"should create a new file in project repo"
do
Gitlab
::
Satellite
::
NewFileAction
.
any_instance
.
stub
(
commit!:
true
,
...
...
@@ -35,12 +44,38 @@ describe API::API do
end
end
def
valid_params
{
file_name:
'newfile.rb'
,
branch_name:
'master'
,
content:
'puts 8'
,
commit_message:
'Added newfile'
describe
"PUT /projects/:id/repository/files"
do
let
(
:valid_params
)
{
{
file_path:
'spec/spec_helper.rb'
,
branch_name:
'master'
,
content:
'puts 8'
,
commit_message:
'Changed file'
}
}
it
"should update existing file in project repo"
do
Gitlab
::
Satellite
::
EditFileAction
.
any_instance
.
stub
(
commit!:
true
,
)
put
api
(
"/projects/
#{
project
.
id
}
/repository/files"
,
user
),
valid_params
response
.
status
.
should
==
200
json_response
[
'file_path'
].
should
==
'spec/spec_helper.rb'
end
it
"should return a 400 bad request if no params given"
do
put
api
(
"/projects/
#{
project
.
id
}
/repository/files"
,
user
)
response
.
status
.
should
==
400
end
it
"should return a 400 if satellite fails to create file"
do
Gitlab
::
Satellite
::
EditFileAction
.
any_instance
.
stub
(
commit!:
false
,
)
put
api
(
"/projects/
#{
project
.
id
}
/repository/files"
,
user
),
valid_params
response
.
status
.
should
==
400
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