Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g

# Conflicts:
#	Gemfile.lock

2 files changed, 4 insertions, 4 deletions

diff --git a/app/services/files/create_service.rb b/app/services/files/create_service.rb
index 91d715b2d63..ffbb5993279 100644
--- a/app/services/files/create_service.rb
+++ b/app/services/files/create_service.rb
@@ -19,10 +19,12 @@ module Files
       end
 
       unless project.empty_repo?
+        @file_path.slice!(0) if @file_path.start_with?('/')
+
         blob = repository.blob_at_branch(@current_branch, @file_path)
 
         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
diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb
index 1bb2462565a..e54a13ed6c5 100644
--- a/app/services/projects/create_service.rb
+++ b/app/services/projects/create_service.rb
@@ -55,9 +55,7 @@ module Projects
         @project.save
 
         if @project.persisted? && !@project.import?
-          unless @project.create_repository
-            raise 'Failed to create repository'
-          end
+          raise 'Failed to create repository' unless @project.create_repository
         end
       end