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
iv
gitlab-ce
Commits
43f560b1
Commit
43f560b1
authored
Aug 06, 2014
by
Sytse Sijbrandij
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add comments.
parent
aa5e663f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-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
+2
-0
No files found.
app/services/files/update_service.rb
View file @
43f560b1
...
@@ -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. Maybe the file
changed,
or there was nothing to commit?"
)
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 @
43f560b1
...
@@ -87,6 +87,8 @@ error message. Possible causes for a failed commit include:
...
@@ -87,6 +87,8 @@ error message. Possible causes for a failed commit include:
user tried to make an empty commit;
user tried to make an empty commit;
-
the branch was updated by a Git push while the file edit was in progress.
-
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