lib/api/api.rb · c5896b8d77d522e40f911c48ca6ffe66d5ddcc5f · nexedi / gitlab-ce · GitLab

Find file Blame History Permalink

Merge branch 'master' into '3839-ci-cd-only-github-projects-fe' · c5896b8d
Douwe Maan authored Mar 07, 2018
```
# Conflicts:
#   config/sidekiq_queues.yml
```
c5896b8d