summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim "BKC" Carlbäcker <kim.carlbacker@gmail.com>2016-12-15 22:29:47 +0100
committerKim "BKC" Carlbäcker <kim.carlbacker@gmail.com>2016-12-15 22:29:47 +0100
commit771dd68cdff9c1f57082fd99af5c22c3af96e7c5 (patch)
tree4e3c60de1b5ae66928bf232adc34c84d081bb68d
parent692426b13ecff871890a853bebef19d63ee4985e (diff)
downloadgitlab-ce-771dd68cdff9c1f57082fd99af5c22c3af96e7c5.tar.gz
linting
-rw-r--r--app/models/ci/build.rb2
-rw-r--r--lib/ci/api/builds.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index cab9393344b..5c84833b806 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -83,7 +83,7 @@ module Ci
state_machine :status do
after_transition any => [:pending] do |build|
build.run_after_commit do
- BuildQueueWorker.perform_async(id)
+ BuildQueueWorker.perform_async(id)
end
end
diff --git a/lib/ci/api/builds.rb b/lib/ci/api/builds.rb
index acb0ca8719f..df32f64ef83 100644
--- a/lib/ci/api/builds.rb
+++ b/lib/ci/api/builds.rb
@@ -18,8 +18,8 @@ module Ci
last_update = Gitlab::Redis.with { |redis| redis.get(current_runner_redis_key)}
- if params[:last_update] != ""
- if :last_update == last_update
+ if params[:last_update].present?
+ if params[:last_update] == last_update
headers 'X-GitLab-Last-Update', last_update
return build_not_found!
end