Commit fe85df27 authored by Kati Paizee's avatar Kati Paizee

Merge branch 'fix/doc-integration-integrations-2' into 'master'

Doc Consistency: integration - integrations (Part 2)

See merge request gitlab-org/gitlab!71147
parents 246c3955 91e9f840
...@@ -14,7 +14,7 @@ was deprecated in favor of the ...@@ -14,7 +14,7 @@ was deprecated in favor of the
Please use documentation for the new [Jenkins CI service](jenkins.md). Please use documentation for the new [Jenkins CI service](jenkins.md).
NOTE: NOTE:
This service was [removed in v13.0](https://gitlab.com/gitlab-org/gitlab/-/issues/1600) This service was [removed](https://gitlab.com/gitlab-org/gitlab/-/issues/1600) in GitLab 13.0
Integration includes: Integration includes:
......
...@@ -4,7 +4,7 @@ group: Integrations ...@@ -4,7 +4,7 @@ group: Integrations
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
--- ---
# Sign into GitLab with (almost) any OAuth2 provider **(FREE)** # Sign into GitLab with (almost) any OAuth2 provider **(FREE SELF)**
The `omniauth-oauth2-generic` gem allows Single Sign-On between GitLab and your own OAuth2 provider The `omniauth-oauth2-generic` gem allows Single Sign-On between GitLab and your own OAuth2 provider
(or any OAuth2 provider compatible with this gem) (or any OAuth2 provider compatible with this gem)
......
...@@ -4,7 +4,7 @@ group: Integrations ...@@ -4,7 +4,7 @@ group: Integrations
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
--- ---
# OmniAuth **(FREE)** # OmniAuth **(FREE SELF)**
GitLab leverages OmniAuth to allow users to sign in using Twitter, GitHub, and GitLab leverages OmniAuth to allow users to sign in using Twitter, GitHub, and
other popular services. [OmniAuth](https://rubygems.org/gems/omniauth/) is a other popular services. [OmniAuth](https://rubygems.org/gems/omniauth/) is a
......
...@@ -4,7 +4,7 @@ group: Integrations ...@@ -4,7 +4,7 @@ group: Integrations
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
--- ---
# reCAPTCHA **(FREE)** # reCAPTCHA **(FREE SELF)**
GitLab leverages [Google's reCAPTCHA](https://www.google.com/recaptcha/about/) GitLab leverages [Google's reCAPTCHA](https://www.google.com/recaptcha/about/)
to protect against spam and abuse. GitLab displays the CAPTCHA form on the sign-up page to protect against spam and abuse. GitLab displays the CAPTCHA form on the sign-up page
......
...@@ -4,7 +4,7 @@ group: Integrations ...@@ -4,7 +4,7 @@ group: Integrations
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
--- ---
# Salesforce OmniAuth Provider **(FREE)** # Salesforce OmniAuth Provider **(FREE SELF)**
You can integrate your GitLab instance with [Salesforce](https://www.salesforce.com/) to enable users to log in to your GitLab instance with their Salesforce account. You can integrate your GitLab instance with [Salesforce](https://www.salesforce.com/) to enable users to log in to your GitLab instance with their Salesforce account.
......
...@@ -6,7 +6,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w ...@@ -6,7 +6,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
# Slash commands in Mattermost and Slack **(FREE)** # Slash commands in Mattermost and Slack **(FREE)**
> - [Moved](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/24780) to GitLab Free in 11.9. > - [Moved](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/24780) from GitLab Ultimate to GitLab Free in 11.9.
If you want to control and view GitLab content while you're If you want to control and view GitLab content while you're
working in Slack and Mattermost, you can use slash commands. working in Slack and Mattermost, you can use slash commands.
......
...@@ -4,7 +4,7 @@ group: Integrations ...@@ -4,7 +4,7 @@ group: Integrations
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
--- ---
# Twitter OAuth 2.0 OmniAuth Provider **(FREE)** # Twitter OAuth 2.0 OmniAuth Provider **(FREE SELF)**
To enable the Twitter OmniAuth provider you must register your application with To enable the Twitter OmniAuth provider you must register your application with
Twitter. Twitter generates a client ID and secret key for you to use. Twitter. Twitter generates a client ID and secret key for you to use.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment