Automatic merge of gitlab-org/gitlab-ce master

f6a5dda9 · GitLab Bot · 866672cb · d05a806f · f6a5dda9 · f6a5dda9
Commit f6a5dda9 authored Jun 19, 2019 by GitLab Bot
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

changelogs/unreleased/expose-saml-provider-id-to-users-api.yml ...elogs/unreleased/expose-saml-provider-id-to-users-api.yml +5 -0

doc/api/users.md doc/api/users.md +1 -1

No files found.
--- a/changelogs/unreleased/expose-saml-provider-id-to-users-api.yml
+++ b/changelogs/unreleased/expose-saml-provider-id-to-users-api.yml
+---
+title: Expose saml_provider_id in the users API
+merge_request: 14045
+author:
+type: added
--- a/doc/api/users.md
+++ b/doc/api/users.md
@@ -1264,4 +1264,4 @@ Example response:

 Please note that `last_activity_at` is deprecated, please use `last_activity_on`.

-[gemojione-index]: https://github.com/jonathanwiesel/gemojione/blob/master/config/index.json
+[gemojione-index]: https://github.com/jonathanwiesel/gemojione/blob/master/config/index.json
\ No newline at end of file