Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #240: Redacted Gitlab API doc #283

Merged
merged 2 commits into from
Aug 11, 2023
Merged

Fixes #240: Redacted Gitlab API doc #283

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9aeb152
Redacted Gitlab API doc
ralf401 Aug 11, 2023
8ce3a51
Redacted Gitlab API
ralf401 Aug 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified ...ings/security/third-party/gitlab/enable-authentication-via-gitlab-in-zammad.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions locale/admin-docs.pot
View file
Open in desktop
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 13:58+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:50
#: ../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:46
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,7 +12005,7 @@ 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."
msgstr ""

#: ../settings/security/third-party/gitlab.rst:22
Expand All @@ -12017,22 +12017,22 @@ msgid "Enter the \"APP ID\" and the \"APP SECRET\" from the Gitlab OAUTH Applica
msgstr ""

#: ../settings/security/third-party/gitlab.rst:27
msgid "Please ensure to use ``https://{git_host}/api/v4/`` for site."
msgid "Please ensure to use ``https://{git_host}/`` without any ``/api/v4`` suffix for site."
ralf401 marked this conversation as resolved.
Show resolved Hide resolved
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:34
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:40
msgid "If you click on the icon you will be redirected to Gitlab and see something similar to this:"
msgstr ""

Expand Down
5 changes: 3 additions & 2 deletions settings/security/third-party/gitlab.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,16 @@ 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.
ralf401 marked this conversation as resolved.
Show resolved Hide resolved

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.
.. note:: Please ensure to use ``https://{git_host}/`` without any ``/api/v4``
suffix for site.

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