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
d6697bbd
Commit
d6697bbd
authored
Sep 12, 2015
by
Job van der Voort
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'improve-error-message' into 'master'
Improve english of error message See merge request !1284
parents
5fcfba27
001738e9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
app/services/files/create_service.rb
app/services/files/create_service.rb
+1
-1
No files found.
app/services/files/create_service.rb
View file @
d6697bbd
...
@@ -22,7 +22,7 @@ module Files
...
@@ -22,7 +22,7 @@ module Files
blob
=
repository
.
blob_at_branch
(
@current_branch
,
@file_path
)
blob
=
repository
.
blob_at_branch
(
@current_branch
,
@file_path
)
if
blob
if
blob
raise_error
(
"Your changes could not be committed
, because file with such name
exists"
)
raise_error
(
"Your changes could not be committed
because a file with the same name already
exists"
)
end
end
end
end
end
end
...
...
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