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 /lib/api/commit_statuses.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 'lib/api/commit_statuses.rb')
0 files changed, 0 insertions, 0 deletions