From 54842848ec3bd520874c7d88ffc7d30e43e312d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Wed, 29 Mar 2017 11:36:26 +0000
Subject: Merge branch 'optimistic-locking-ci-status-change' into 'master'

Make CI build to use optimistic locking only on status change

Closes #29679

See merge request !10152
---
 app/models/commit_status.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app')

diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index 8c71267da65..17b322b5ae3 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -105,6 +105,10 @@ class CommitStatus < ActiveRecord::Base
     end
   end
 
+  def locking_enabled?
+    status_changed?
+  end
+
   def before_sha
     pipeline.before_sha || Gitlab::Git::BLANK_SHA
   end
-- 
cgit v1.2.3