delta/gitlab/gitlab-ce.git, branch 10-8-stable-patch-1

Merge branch 'ldap-u2f-fix' into 'master'

2018-05-23T17:10:50+00:00

Fixed U2F authentication when used with LDAP

Closes #46661

See merge request gitlab-org/gitlab-ce!19115

Merge branch '46630-add-missing-columns-to-project-mirror-data' into 'master'

2018-05-23T15:59:08+00:00

Upgrading from EE to CE fails on project_mirror_data migrations

Closes #46630

See merge request gitlab-org/gitlab-ce!19109

Merge branch '46413-error-when-prometheus-adapter-is-disabled' into 'master'

2018-05-23T15:58:30+00:00

Render 404 when prometheus adapter is disabled in Prometheus metrics controller

Closes #46413

See merge request gitlab-org/gitlab-ce!19110

Merge branch '10-8-stable-patch-1-fix-conflict' into '10-8-stable-patch-1'

2018-05-23T14:40:14+00:00

Fix conflict when picking `bump prometheus-client-mmap to 0.9.3 to fix nil exception error` to patch stable branch

See merge request gitlab-org/gitlab-ce!19105

Fix conflicts in Gemfile and Gemfile.lock

2018-05-23T12:15:24+00:00

Merge branch 'ide-commit-state-bug' into 'master'

2018-05-23T09:22:39+00:00

Fixed web IDE review & commit editors getting into incorrect state

Closes #46392

See merge request gitlab-org/gitlab-ce!19038

Merge branch 'ide-file-finder-improve-order' into 'master'

2018-05-23T09:22:23+00:00

Fixed IDE file finder ordering

See merge request gitlab-org/gitlab-ce!18948

Merge branch 'sh-bump-prometheus-client-mmap' into 'master'

2018-05-23T09:15:53+00:00

Bump prometheus-client-mmap to 0.9.3 to fix nil exception error

See merge request gitlab-org/gitlab-ce!19085

Merge branch '46381-dropdown-mr-widget-backport' into '10-8-stable-patch-1'

2018-05-22T12:28:18+00:00

Resolve "Dropdown actions in mini pipeline graph in mr widget don't work"

See merge request gitlab-org/gitlab-ce!19029

Merge branch 'sh-fast-admin-counts' into 'master'

2018-05-22T11:36:52+00:00

Fix Error 500 viewing admin page due to statement timeouts

Closes #46255

See merge request gitlab-org/gitlab-ce!18982