Merge branch 'report-errors-on-service-creation' of https://gitlab.com/stanhu/gitlab-ce

CHANGELOG

@@ -2,6 +2,8 @@ Please view this file on the master branch, on stable branches it's out of date.
 
 v 8.3.0 (unreleased)
   - Add button to automatically merge a merge request when the build succeeds (Zeger-Jan van de Weg)
+  - Merge when build succeeds (Zeger-Jan van de Weg)
+  - Provide better diagnostic message upon project creation errors (Stan Hu)
   - Bump gollum-lib to 4.1.0 (Stan Hu)
   - Fix broken group avatar upload under "New group" (Stan Hu)
   - Update project repositorize size and commit count during import:repos task (Stan Hu)

app/services/projects/create_service.rb

@@ -64,8 +64,10 @@ module Projects
       after_create_actions if @project.persisted?
 
       @project
-    rescue
-      @project.errors.add(:base, "Can't save project. Please try again later")
+    rescue => e
+      message = "Unable to save project: #{e.message}"
+      Rails.logger.error(message)
+      @project.errors.add(:base, message) if @project
       @project
     end
 

spec/services/projects/create_service_spec.rb

@@ -49,6 +49,13 @@ describe Projects::CreateService, services: true do
       it { expect(@project.namespace).to eq(@group) }
     end
 
+    context 'error handling' do
+      it 'handles invalid options' do
+        @opts.merge!({ default_branch: 'master' } )
+        expect(create_project(@user, @opts)).to eq(nil)
+      end
+    end
+
     context 'wiki_enabled creates repository directory' do
       context 'wiki_enabled true creates wiki repository directory' do
         before do