Merge branch 'update_7-13-stable' into '7-13-stable'

Update 7-13-stable with 7.13.4



See merge request !230

CHANGELOG

+v7.13.4
+  - Fix broken yaml error saving
+
 v7.13.1
   - Fix: user could steal specific runner
   - Fix: don't send notifications for jobs with allow_failure set
@@ -74,10 +77,8 @@ v7.11.0
 v7.10.1
   - Fix failing migration when update to 7.10 from 7.8 and older versions
-
-sidekiq_wirker_fix
-	- added sidekiq.yml
-	- integrated in script/background_jobs
+  - added sidekiq.yml
+  - integrated in script/background_jobs
 v7.10.0
   - Projects sorting by last commit date
   - Add project search at runner page

app/models/commit.rb

@@ -246,7 +246,7 @@ class Commit < ActiveRecord::Base
   private
   def save_yaml_error(error)
-    return unless self.yaml_errors?
+    return if self.yaml_errors?
     self.yaml_errors = error
     save
   end

spec/services/create_commit_service_spec.rb

@@ -97,5 +97,20 @@ describe CreateCommitService do
       )
       commit.builds.count(:all).should == 2
     end
+
+    it "creates commit with failed status if yaml is invalid" do
+      commits = [{message: "some message"}]
+
+      commit = service.execute(project,
+                               ref: 'refs/tags/0_1',
+                               before: '00000000',
+                               after: '31das312',
+                               commits: commits,
+                               ci_yaml_file: "invalid: file"
+      )
+
+      commit.status.should == "failed"
+      commit.builds.any?.should be_false
+    end
   end
 end