diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-06-07 10:27:52 +0200 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-06-07 10:27:52 +0200 |
| commit | dbb3c28088b63c8cf40a90c599b6eedb4dfbbb66 (patch) | |
| tree | 9e6c4d495e45355ef62c56c0c3e102f95220f89f /spec/finders/members_finder_spec.rb | |
| parent | a924152219c1367bf494f3f387d050ac3ff2d7d3 (diff) | |
| parent | dddc54aa0aea4088e5a233d18a62cb2435590fe9 (diff) | |
| download | gitlab-ce-dbb3c28088b63c8cf40a90c599b6eedb4dfbbb66.tar.gz | |
Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-review-branch
# Conflicts:
# app/models/project_services/prometheus_service.rb
# app/views/projects/services/_form.html.haml
Diffstat (limited to 'spec/finders/members_finder_spec.rb')
0 files changed, 0 insertions, 0 deletions