summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2015-06-17 15:14:42 +0300
committerValery Sizov <vsv2711@gmail.com>2015-06-17 15:14:42 +0300
commit4a51d505b0350e6b72baf1e2812ca0bad4986ca7 (patch)
tree9184810722747874b90e41133e89939d10c8daaa
parent7cf28a7c48a59092004a8f69ef6c6b33548e3b2e (diff)
downloadgitlab-ci-4a51d505b0350e6b72baf1e2812ca0bad4986ca7.tar.gz
code style
-rw-r--r--app/models/commit.rb7
-rw-r--r--db/schema.rb1
2 files changed, 2 insertions, 6 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb
index da755bc..1d3f214 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -224,12 +224,7 @@ class Commit < ActiveRecord::Base
def skip_ci?
commits = push_data[:commits]
-
- if commits.present? && commits.last[:message] =~ /(\[ci skip\])/
- true
- else
- false
- end
+ commits.present? && commits.last[:message] =~ /(\[ci skip\])/
end
private
diff --git a/db/schema.rb b/db/schema.rb
index 2046dcc..b1eaef6 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -28,6 +28,7 @@ ActiveRecord::Schema.define(version: 20150616001155) do
t.integer "commit_id"
t.float "coverage"
t.text "commands"
+ t.integer "job_id"
t.string "name"
t.boolean "deploy", default: false
end