diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-08-07 09:13:10 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-08-07 09:13:10 +0000 |
| commit | 727b6d16e5e11933c0879cfa9ed5eb3bb9280cf1 (patch) | |
| tree | 16649f5e4d23fb0a0d5f0b28cb25890d7999f493 /lib/api/namespaces.rb | |
| parent | 4b34720c0ca8b5459cc56a4e52e11e213ab6ae9a (diff) | |
| parent | 440dc934dec31b4ef3ee78e5ae366f832719b173 (diff) | |
| download | gitlab-ce-727b6d16e5e11933c0879cfa9ed5eb3bb9280cf1.tar.gz | |
Merge branch 'master' into 'bvl-nfs-circuitbreaker'
# Conflicts:
# app/models/repository.rb
# spec/models/repository_spec.rb
Diffstat (limited to 'lib/api/namespaces.rb')
0 files changed, 0 insertions, 0 deletions