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
15eaeb8e
Commit
15eaeb8e
authored
Aug 06, 2014
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'doc/api_file_edit' into 'master'
Make file edit error message less specific See merge request !1007
parents
352af72f
43f560b1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
app/services/files/update_service.rb
app/services/files/update_service.rb
+1
-1
doc/api/repository_files.md
doc/api/repository_files.md
+9
-0
No files found.
app/services/files/update_service.rb
View file @
15eaeb8e
...
@@ -33,7 +33,7 @@ module Files
...
@@ -33,7 +33,7 @@ module Files
if
created_successfully
if
created_successfully
success
success
else
else
error
(
"Your changes could not be committed
, because the file has been changed
"
)
error
(
"Your changes could not be committed
. Maybe the file was changed by another process or there was nothing to commit?
"
)
end
end
end
end
end
end
...
...
doc/api/repository_files.md
View file @
15eaeb8e
...
@@ -80,6 +80,15 @@ Parameters:
...
@@ -80,6 +80,15 @@ Parameters:
-
`content`
(required) - New file content
-
`content`
(required) - New file content
-
`commit_message`
(required) - Commit message
-
`commit_message`
(required) - Commit message
If the commit fails for any reason we return a 400 error with a non-specific
error message. Possible causes for a failed commit include:
-
the
`file_path`
contained
`/../`
(attempted directory traversal);
-
the new file contents were identical to the current file contents, i.e. the
user tried to make an empty commit;
-
the branch was updated by a Git push while the file edit was in progress.
Currently gitlab-shell has a boolean return code, preventing GitLab from specifying the error.
## Delete existing file in repository
## Delete existing file in repository
```
```
...
...
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