Merge branch 'develop' into trustie-pipeline
# Conflicts: # app/models/ci/pipeline.rb
This commit is contained in:
commit
b18fbd698f
|
@ -14,6 +14,7 @@
|
||||||
# branch :string(255)
|
# branch :string(255)
|
||||||
# event :string(255)
|
# event :string(255)
|
||||||
# sha :string(255)
|
# sha :string(255)
|
||||||
|
# identifier :string(255)
|
||||||
#
|
#
|
||||||
|
|
||||||
class Ci::Pipeline < Ci::LocalBase
|
class Ci::Pipeline < Ci::LocalBase
|
||||||
|
|
Loading…
Reference in New Issue