diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-09 23:53:02 +0300 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-09 23:53:02 +0300 |
| commit | 7c1acb022a215743caa57fde3bb3459b35aaf01d (patch) | |
| tree | b85e3113397e980894f08042bb3e387b6f4b0b39 /app/models/ci/commit.rb | |
| parent | 1ad0c968d579fe6ac0b2fc00a1dae32449ceb2c3 (diff) | |
| parent | 44501820152083d231459223fe09b9d9641b7c1e (diff) | |
| download | gitlab-ce-7c1acb022a215743caa57fde3bb3459b35aaf01d.tar.gz | |
Merge remote-tracking branch 'origin/master' into with-pipeline-view
# Conflicts:
# app/views/projects/ci/builds/_build.html.haml
# app/views/projects/commit/_ci_commit.html.haml
# app/views/projects/commit/_commit_box.html.haml
Diffstat (limited to 'app/models/ci/commit.rb')
| -rw-r--r-- | app/models/ci/commit.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/models/ci/commit.rb b/app/models/ci/commit.rb index fadf5c62984..759c31b0055 100644 --- a/app/models/ci/commit.rb +++ b/app/models/ci/commit.rb @@ -4,9 +4,9 @@ # # id :integer not null, primary key # project_id :integer -# ref :string(255) -# sha :string(255) -# before_sha :string(255) +# ref :string +# sha :string +# before_sha :string # push_data :text # created_at :datetime # updated_at :datetime @@ -14,6 +14,10 @@ # yaml_errors :text # committed_at :datetime # gl_project_id :integer +# status :string +# started_at :datetime +# finished_at :datetime +# duration :integer # module Ci |