spec/features/admin/admin_users_spec.rb · 89d4144c085ece0cc99a616b11c19e35c6dbb66e · nexedi / gitlab-ce · GitLab

You need to sign in or sign up before continuing.

Find file Blame History Permalink

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-08 · 89d4144c
GitLab Bot authored Feb 08, 2018
```
# Conflicts:
#	app/assets/javascripts/pipelines/components/async_button.vue
#	locale/gitlab.pot

[ci skip]
```
89d4144c