summaryrefslogtreecommitdiff
path: root/spec/services/ci
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-07-28 07:26:08 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-07-28 07:26:08 +0000
commit96c4a15eae9b93a2bfb512309e860da50d2e2636 (patch)
treecf5f4cf12ae735bfdb1891fafd94d851322c42eb /spec/services/ci
parent9bc176b2c39f1c27ce8ed4c13cf06e53331c16c9 (diff)
parentb5aac468693f6ffaada170aebedc623768ce87d4 (diff)
downloadgitlab-ce-96c4a15eae9b93a2bfb512309e860da50d2e2636.tar.gz
Merge branch 'master' into 'sh-augment-lograge-output'
# Conflicts: # config/initializers/lograge.rb
Diffstat (limited to 'spec/services/ci')
0 files changed, 0 insertions, 0 deletions