Skip to content

Commit

Permalink
Fixes #240: Redacted Gitlab API doc
Browse files Browse the repository at this point in the history
  • Loading branch information
ralf401 authored Aug 11, 2023
1 parent 2c3ab53 commit a41d3b8
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 15 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 7 additions & 11 deletions locale/admin-docs.pot
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zammad pre-release\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-10 14:40+0200\n"
"POT-Creation-Date: 2023-08-11 16:22+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -11921,7 +11921,7 @@ msgstr ""

#: ../settings/security/third-party/facebook.rst:44
#: ../settings/security/third-party/github.rst:43
#: ../settings/security/third-party/gitlab.rst:49
#: ../settings/security/third-party/gitlab.rst:47
#: ../settings/security/third-party/twitter.rst:50
msgid "Now you can link accounts via \"Avatar -> Profile -> Link Accounts\" or login via Zammad login page."
msgstr ""
Expand Down Expand Up @@ -11976,7 +11976,7 @@ msgid "GitHub oauth page"
msgstr ""

#: ../settings/security/third-party/github.rst:40
#: ../settings/security/third-party/gitlab.rst:45
#: ../settings/security/third-party/gitlab.rst:43
msgid "When you grant the access you will be redirected to your Zammad instance and logged in as a customer."
msgstr ""

Expand Down Expand Up @@ -12005,34 +12005,30 @@ msgid "Register OAuth app on gitlab instance"
msgstr ""

#: ../settings/security/third-party/gitlab.rst:18
msgid "At the moment we need the \"api\" scope. This is caused due a bug in Gitlab: https://gitlab.com/gitlab-org/gitlab-ce/issues/33022"
msgid "At the moment we need the \"api\" scope. This is caused due a bug in Gitlab https://gitlab.com/gitlab-org/gitlab-ce/issues/33022."
msgstr ""

#: ../settings/security/third-party/gitlab.rst:22
msgid "Configure Zammad as Gitlab app"
msgstr ""

#: ../settings/security/third-party/gitlab.rst:24
msgid "Enter the \"APP ID\" and the \"APP SECRET\" from the Gitlab OAUTH Applications Dashboard."
msgstr ""

#: ../settings/security/third-party/gitlab.rst:27
msgid "Please ensure to use ``https://{git_host}/api/v4/`` for site."
msgid "Enter the \"APP ID\" and the \"APP SECRET\" from the Gitlab OAUTH Applications Dashboard and your Gitlab-URL in the \"SITE\" field."
msgstr ""

#: ../settings/security/third-party/gitlab.rst:None
msgid "Gitlab config in Zammad admin interface"
msgstr ""

#: ../settings/security/third-party/gitlab.rst:33
#: ../settings/security/third-party/gitlab.rst:31
msgid "After you configured the Gitlab credentials and activated the login method, you should see a new icon on the login page."
msgstr ""

#: ../settings/security/third-party/gitlab.rst:None
msgid "Gitlab logo on login page"
msgstr ""

#: ../settings/security/third-party/gitlab.rst:39
#: ../settings/security/third-party/gitlab.rst:37
msgid "If you click on the icon you will be redirected to Gitlab and see something similar to this:"
msgstr ""

Expand Down
6 changes: 2 additions & 4 deletions settings/security/third-party/gitlab.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,13 @@ where zammad_host has to be replaced with your Zammad FQDN
:alt: Register OAuth app on gitlab instance

At the moment we need the "api" scope. This is caused due a bug
in Gitlab: https://gitlab.com/gitlab-org/gitlab-ce/issues/33022
in Gitlab https://gitlab.com/gitlab-org/gitlab-ce/issues/33022.

Configure Zammad as Gitlab app
------------------------------

Enter the "APP ID" and the "APP SECRET" from the Gitlab OAUTH Applications
Dashboard.

.. note:: Please ensure to use ``https://{git_host}/api/v4/`` for site.
Dashboard and your Gitlab-URL in the "SITE" field.

.. image:: /images/settings/security/third-party/gitlab/enable-authentication-via-gitlab-in-zammad.png
:alt: Gitlab config in Zammad admin interface
Expand Down

0 comments on commit a41d3b8

Please sign in to comment.