Merge branch 'develop' into trustie-pipeline

# Conflicts: # app/models/ci/pipeline.rb
2021-02-02 14:41:23 +08:00 · 2021-02-02 14:41:23 +08:00 · b18fbd698f
parent 6053907828 458fca9992
commit b18fbd698f
1 changed files with 1 additions and 0 deletions
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@ -14,6 +14,7 @@
 #  branch          :string(255)
 #  event           :string(255)
 #  sha             :string(255)
+#  identifier      :string(255)
 #

 class Ci::Pipeline < Ci::LocalBase