summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/diff/file_collection/merge_request_diff_spec.rb
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-12-02 10:37:09 +0000
committerRobert Speicher <robert@gitlab.com>2016-12-02 10:37:09 +0000
commit2394afe4304626130ee70ec095b9d9b399868969 (patch)
treec540265302c97ca74a17967058a8b44bd7ab031c /spec/lib/gitlab/diff/file_collection/merge_request_diff_spec.rb
parentc8fb6f6f37c014c8891e31d48b89ef68d6d8af28 (diff)
parentdbce8432eff53f2b7051be996f8ac3b304e73e0a (diff)
downloadgitlab-ce-2394afe4304626130ee70ec095b9d9b399868969.tar.gz
Merge branch 'workhorse-1.1.0' into 'master'
Use gitlab-workhorse 1.1.0. Adds Prometheus support and more. See merge request !7868
Diffstat (limited to 'spec/lib/gitlab/diff/file_collection/merge_request_diff_spec.rb')
0 files changed, 0 insertions, 0 deletions