summaryrefslogtreecommitdiff
path: root/lib/api/files.rb
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-06-05 07:39:59 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2018-06-05 07:39:59 +0000
commit809a50fcbf5ecfbf5ec02671f1ca2710a96f58d3 (patch)
tree0b77ad7a705f6477b03d0f83634a73e3cf36f7d1 /lib/api/files.rb
parent114c26ccf0f10788271c6108774e72809a7f93e1 (diff)
parent04236363bce399fbde36f396fdcf51d61735e1b0 (diff)
downloadgitlab-ce-809a50fcbf5ecfbf5ec02671f1ca2710a96f58d3.tar.gz
Merge branch 'master' into 'backstage/gb/use-persisted-stages-to-improve-pipelines-table'backstage/gb/use-persisted-stages-to-improve-pipelines-table
Conflicts: app/models/ci/pipeline.rb
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions