app/assets/javascripts/api.js · e949386cad79ca62b8a86df39a932f22aa16e0a2 · nexedi / gitlab-ce · GitLab

Find file Blame History Permalink

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-01 · e949386c
GitLab Bot authored Jun 01, 2018
```
# Conflicts:
#	app/assets/javascripts/api.js
#	doc/administration/auth/ldap.md
#	lib/gitlab/auth.rb

[ci skip]
```
e949386c