Коммит 72a91622 создал по автору Marcel Amirault's avatar Marcel Amirault Зафиксировано автором Achilleas Pipinellis
Просмотр файлов

Update capitalization in /integrations and /raketasks

Also updates redirect text in /project-services
владелец f91b5d58
...@@ -30,7 +30,7 @@ application. ...@@ -30,7 +30,7 @@ application.
1. On your GitLab server, open the configuration file. 1. On your GitLab server, open the configuration file.
For omnibus package: For Omnibus package:
```sh ```sh
sudo editor /etc/gitlab/gitlab.rb sudo editor /etc/gitlab/gitlab.rb
...@@ -48,7 +48,7 @@ application. ...@@ -48,7 +48,7 @@ application.
1. Add the provider configuration: 1. Add the provider configuration:
For omnibus package: For Omnibus package:
```ruby ```ruby
gitlab_rails['omniauth_providers'] = [ gitlab_rails['omniauth_providers'] = [
......
...@@ -32,7 +32,7 @@ To enable the Microsoft Azure OAuth2 OmniAuth provider you must register your ap ...@@ -32,7 +32,7 @@ To enable the Microsoft Azure OAuth2 OmniAuth provider you must register your ap
1. On your GitLab server, open the configuration file. 1. On your GitLab server, open the configuration file.
For omnibus package: For Omnibus package:
```sh ```sh
sudo editor /etc/gitlab/gitlab.rb sudo editor /etc/gitlab/gitlab.rb
...@@ -50,7 +50,7 @@ To enable the Microsoft Azure OAuth2 OmniAuth provider you must register your ap ...@@ -50,7 +50,7 @@ To enable the Microsoft Azure OAuth2 OmniAuth provider you must register your ap
1. Add the provider configuration: 1. Add the provider configuration:
For omnibus package: For Omnibus package:
```ruby ```ruby
gitlab_rails['omniauth_providers'] = [ gitlab_rails['omniauth_providers'] = [
......
...@@ -4,7 +4,7 @@ To enable the CAS OmniAuth provider you must register your application with your ...@@ -4,7 +4,7 @@ To enable the CAS OmniAuth provider you must register your application with your
1. On your GitLab server, open the configuration file. 1. On your GitLab server, open the configuration file.
For omnibus package: For Omnibus package:
```sh ```sh
sudo editor /etc/gitlab/gitlab.rb sudo editor /etc/gitlab/gitlab.rb
...@@ -22,7 +22,7 @@ To enable the CAS OmniAuth provider you must register your application with your ...@@ -22,7 +22,7 @@ To enable the CAS OmniAuth provider you must register your application with your
1. Add the provider configuration: 1. Add the provider configuration:
For omnibus package: For Omnibus package:
```ruby ```ruby
gitlab_rails['omniauth_providers'] = [ gitlab_rails['omniauth_providers'] = [
......
...@@ -123,8 +123,8 @@ production instances, they recommend considerably more resources. ...@@ -123,8 +123,8 @@ production instances, they recommend considerably more resources.
Storage requirements also vary based on the installation side, but as a rule of Storage requirements also vary based on the installation side, but as a rule of
thumb, you should allocate the total size of your production database, **plus** thumb, you should allocate the total size of your production database, **plus**
two-thirds of the total size of your git repositories. Efforts to reduce this two-thirds of the total size of your Git repositories. Efforts to reduce this
total are being tracked in this epic: [gitlab-org&153](https://gitlab.com/groups/gitlab-org/-/epics/153). total are being tracked in [epic &153](https://gitlab.com/groups/gitlab-org/-/epics/153).
## Enabling Elasticsearch ## Enabling Elasticsearch
...@@ -341,27 +341,27 @@ Currently for repository and snippet files, GitLab would only index up to 1 MB o ...@@ -341,27 +341,27 @@ Currently for repository and snippet files, GitLab would only index up to 1 MB o
There are several rake tasks available to you via the command line: There are several rake tasks available to you via the command line:
- [sudo gitlab-rake gitlab:elastic:index](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/ee/lib/tasks/gitlab/elastic.rake) - [`sudo gitlab-rake gitlab:elastic:index`](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/ee/lib/tasks/gitlab/elastic.rake)
- This is a wrapper task. It does the following: - This is a wrapper task. It does the following:
- `sudo gitlab-rake gitlab:elastic:create_empty_index` - `sudo gitlab-rake gitlab:elastic:create_empty_index`
- `sudo gitlab-rake gitlab:elastic:clear_index_status` - `sudo gitlab-rake gitlab:elastic:clear_index_status`
- `sudo gitlab-rake gitlab:elastic:index_projects` - `sudo gitlab-rake gitlab:elastic:index_projects`
- `sudo gitlab-rake gitlab:elastic:index_snippets` - `sudo gitlab-rake gitlab:elastic:index_snippets`
- [sudo gitlab-rake gitlab:elastic:index_projects](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/ee/lib/tasks/gitlab/elastic.rake) - [`sudo gitlab-rake gitlab:elastic:index_projects`](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/ee/lib/tasks/gitlab/elastic.rake)
- This iterates over all projects and queues sidekiq jobs to index them in the background. - This iterates over all projects and queues sidekiq jobs to index them in the background.
- [sudo gitlab-rake gitlab:elastic:index_projects_status](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/ee/lib/tasks/gitlab/elastic.rake) - [`sudo gitlab-rake gitlab:elastic:index_projects_status`](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/ee/lib/tasks/gitlab/elastic.rake)
- This determines the overall status of the indexing. It is done by counting the total number of indexed projects, dividing by a count of the total number of projects, then multiplying by 100. - This determines the overall status of the indexing. It is done by counting the total number of indexed projects, dividing by a count of the total number of projects, then multiplying by 100.
- [sudo gitlab-rake gitlab:elastic:create_empty_index](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/ee/lib/tasks/gitlab/elastic.rake) - [`sudo gitlab-rake gitlab:elastic:create_empty_index`](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/ee/lib/tasks/gitlab/elastic.rake)
- This generates an empty index on the Elasticsearch side. - This generates an empty index on the Elasticsearch side.
- [sudo gitlab-rake gitlab:elastic:clear_index_status](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/ee/lib/tasks/gitlab/elastic.rake) - [`sudo gitlab-rake gitlab:elastic:clear_index_status`](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/ee/lib/tasks/gitlab/elastic.rake)
- This deletes all instances of IndexStatus for all projects. - This deletes all instances of IndexStatus for all projects.
- [sudo gitlab-rake gitlab:elastic:delete_index](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/ee/lib/tasks/gitlab/elastic.rake) - [`sudo gitlab-rake gitlab:elastic:delete_index`](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/ee/lib/tasks/gitlab/elastic.rake)
- This removes the GitLab index on the Elasticsearch instance. - This removes the GitLab index on the Elasticsearch instance.
- [sudo gitlab-rake gitlab:elastic:recreate_index](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/ee/lib/tasks/gitlab/elastic.rake) - [`sudo gitlab-rake gitlab:elastic:recreate_index`](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/ee/lib/tasks/gitlab/elastic.rake)
- Does the same thing as `sudo gitlab-rake gitlab:elastic:create_empty_index` - Does the same thing as `sudo gitlab-rake gitlab:elastic:create_empty_index`
- [sudo gitlab-rake gitlab:elastic:index_snippets](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/ee/lib/tasks/gitlab/elastic.rake) - [`sudo gitlab-rake gitlab:elastic:index_snippets`](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/ee/lib/tasks/gitlab/elastic.rake)
- Performs an Elasticsearch import that indexes the snippets data. - Performs an Elasticsearch import that indexes the snippets data.
- [sudo gitlab-rake gitlab:elastic:projects_not_indexed](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/ee/lib/tasks/gitlab/elastic.rake) - [`sudo gitlab-rake gitlab:elastic:projects_not_indexed`](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/ee/lib/tasks/gitlab/elastic.rake)
- Displays which projects are not indexed. - Displays which projects are not indexed.
### Environment Variables ### Environment Variables
......
...@@ -49,7 +49,7 @@ To enable the Facebook OmniAuth provider you must register your application with ...@@ -49,7 +49,7 @@ To enable the Facebook OmniAuth provider you must register your application with
1. On your GitLab server, open the configuration file. 1. On your GitLab server, open the configuration file.
For omnibus package: For Omnibus package:
```sh ```sh
sudo editor /etc/gitlab/gitlab.rb sudo editor /etc/gitlab/gitlab.rb
...@@ -67,7 +67,7 @@ To enable the Facebook OmniAuth provider you must register your application with ...@@ -67,7 +67,7 @@ To enable the Facebook OmniAuth provider you must register your application with
1. Add the provider configuration: 1. Add the provider configuration:
For omnibus package: For Omnibus package:
```ruby ```ruby
gitlab_rails['omniauth_providers'] = [ gitlab_rails['omniauth_providers'] = [
......
...@@ -36,7 +36,7 @@ To get the credentials (a pair of Client ID and Client Secret), you must registe ...@@ -36,7 +36,7 @@ To get the credentials (a pair of Client ID and Client Secret), you must registe
1. On your GitLab server, open the configuration file. 1. On your GitLab server, open the configuration file.
For omnibus package: For Omnibus package:
```sh ```sh
sudo editor /etc/gitlab/gitlab.rb sudo editor /etc/gitlab/gitlab.rb
...@@ -54,7 +54,7 @@ To get the credentials (a pair of Client ID and Client Secret), you must registe ...@@ -54,7 +54,7 @@ To get the credentials (a pair of Client ID and Client Secret), you must registe
1. Add the provider configuration: 1. Add the provider configuration:
For omnibus package: For Omnibus package:
For GitHub.com: For GitHub.com:
...@@ -124,7 +124,7 @@ certificate and the imports are failing, you will need to disable SSL verificati ...@@ -124,7 +124,7 @@ certificate and the imports are failing, you will need to disable SSL verificati
It should be disabled by adding `verify_ssl` to `false` in the provider configuration It should be disabled by adding `verify_ssl` to `false` in the provider configuration
and changing the global Git `sslVerify` option to `false` in the GitLab server. and changing the global Git `sslVerify` option to `false` in the GitLab server.
For omnibus package: For Omnibus package:
```ruby ```ruby
gitlab_rails['omniauth_providers'] = [ gitlab_rails['omniauth_providers'] = [
......
...@@ -30,7 +30,7 @@ GitLab.com will generate an application ID and secret key for you to use. ...@@ -30,7 +30,7 @@ GitLab.com will generate an application ID and secret key for you to use.
1. On your GitLab server, open the configuration file. 1. On your GitLab server, open the configuration file.
For omnibus package: For Omnibus package:
```sh ```sh
sudo editor /etc/gitlab/gitlab.rb sudo editor /etc/gitlab/gitlab.rb
...@@ -48,7 +48,7 @@ GitLab.com will generate an application ID and secret key for you to use. ...@@ -48,7 +48,7 @@ GitLab.com will generate an application ID and secret key for you to use.
1. Add the provider configuration: 1. Add the provider configuration:
For omnibus package: For Omnibus package:
```ruby ```ruby
gitlab_rails['omniauth_providers'] = [ gitlab_rails['omniauth_providers'] = [
......
...@@ -14,12 +14,12 @@ Integration includes: ...@@ -14,12 +14,12 @@ Integration includes:
Requirements: Requirements:
- [Jenkins GitLab Hook plugin](https://wiki.jenkins.io/display/JENKINS/GitLab+Hook+Plugin) - [Jenkins GitLab Hook plugin](https://wiki.jenkins.io/display/JENKINS/GitLab+Hook+Plugin)
- git clone access for Jenkins from GitLab repo (via ssh key) - Git clone access for Jenkins from GitLab repo (via ssh key)
## Jenkins ## Jenkins
1. Install [GitLab Hook plugin](https://wiki.jenkins.io/display/JENKINS/GitLab+Hook+Plugin) 1. Install [GitLab Hook plugin](https://wiki.jenkins.io/display/JENKINS/GitLab+Hook+Plugin)
1. Set up jenkins project 1. Set up Jenkins project
![screen](img/jenkins_project.png) ![screen](img/jenkins_project.png)
......
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
redirect_to: '../user/project/integrations/jira.md' redirect_to: '../user/project/integrations/jira.md'
--- ---
This document was moved to [integrations/jira](../user/project/integrations/jira.md). This document was moved to [another location](../user/project/integrations/jira.md).
...@@ -23,7 +23,7 @@ or instance admin (in the case of self-hosted GitLab) set up the integration, ...@@ -23,7 +23,7 @@ or instance admin (in the case of self-hosted GitLab) set up the integration,
in order to simplify administration. in order to simplify administration.
TIP: **Tip:** TIP: **Tip:**
Create and use a single-purpose "jira" user in GitLab, so that removing Create and use a single-purpose `jira` user in GitLab, so that removing
regular users won't impact your integration. regular users won't impact your integration.
## Requirements ## Requirements
......
...@@ -46,7 +46,7 @@ sudo chmod 0600 /etc/http.keytab ...@@ -46,7 +46,7 @@ sudo chmod 0600 /etc/http.keytab
For source installations, make sure the `kerberos` gem group For source installations, make sure the `kerberos` gem group
[has been installed](../install/installation.md#install-gems). [has been installed](../install/installation.md#install-gems).
1. Edit the kerberos section of [gitlab.yml] to enable Kerberos ticket-based 1. Edit the `kerberos` section of [`gitlab.yml`](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/gitlab.yml.example) to enable Kerberos ticket-based
authentication. In most cases, you only need to enable Kerberos and specify authentication. In most cases, you only need to enable Kerberos and specify
the location of the keytab: the location of the keytab:
...@@ -153,7 +153,7 @@ keep offering only `basic` authentication. ...@@ -153,7 +153,7 @@ keep offering only `basic` authentication.
listen [::]:8443 ipv6only=on ssl; listen [::]:8443 ipv6only=on ssl;
``` ```
1. Update the Kerberos section of [gitlab.yml]: 1. Update the `kerberos` section of [`gitlab.yml`](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/gitlab.yml.example):
```yaml ```yaml
kerberos: kerberos:
...@@ -203,7 +203,7 @@ remove the OmniAuth provider named `kerberos` from your `gitlab.yml` / ...@@ -203,7 +203,7 @@ remove the OmniAuth provider named `kerberos` from your `gitlab.yml` /
**For installations from source** **For installations from source**
1. Edit [gitlab.yml] and remove the `- { name: 'kerberos' }` line under omniauth 1. Edit [`gitlab.yml`](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/gitlab.yml.example) and remove the `- { name: 'kerberos' }` line under omniauth
providers: providers:
```yaml ```yaml
...@@ -295,7 +295,6 @@ See also: [Git v2.11 release notes](https://github.com/git/git/blob/master/Docum ...@@ -295,7 +295,6 @@ See also: [Git v2.11 release notes](https://github.com/git/git/blob/master/Docum
- <http://blog.manula.org/2012/04/setting-up-kerberos-server-with-debian.html> - <http://blog.manula.org/2012/04/setting-up-kerberos-server-with-debian.html>
- <http://www.roguelynn.com/words/explain-like-im-5-kerberos/> - <http://www.roguelynn.com/words/explain-like-im-5-kerberos/>
[gitlab.yml]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/gitlab.yml.example
[restart gitlab]: ../administration/restart_gitlab.md#installations-from-source [restart gitlab]: ../administration/restart_gitlab.md#installations-from-source
[reconfigure gitlab]: ../administration/restart_gitlab.md#omnibus-gitlab-reconfigure [reconfigure gitlab]: ../administration/restart_gitlab.md#omnibus-gitlab-reconfigure
[nginx]: http://nginx.org/en/docs/http/ngx_http_core_module.html#large_client_header_buffers [nginx]: http://nginx.org/en/docs/http/ngx_http_core_module.html#large_client_header_buffers
......
...@@ -69,7 +69,7 @@ that are in common for all providers that we need to consider. ...@@ -69,7 +69,7 @@ that are in common for all providers that we need to consider.
To change these settings: To change these settings:
- **For omnibus package** - **For Omnibus package**
Open the configuration file: Open the configuration file:
......
...@@ -29,7 +29,7 @@ To get the credentials (a pair of Client ID and Client Secret), you must [create ...@@ -29,7 +29,7 @@ To get the credentials (a pair of Client ID and Client Secret), you must [create
1. On your GitLab server, open the configuration file. 1. On your GitLab server, open the configuration file.
For omnibus package: For Omnibus package:
```sh ```sh
sudo editor /etc/gitlab/gitlab.rb sudo editor /etc/gitlab/gitlab.rb
...@@ -46,7 +46,7 @@ To get the credentials (a pair of Client ID and Client Secret), you must [create ...@@ -46,7 +46,7 @@ To get the credentials (a pair of Client ID and Client Secret), you must [create
1. Add the provider configuration: 1. Add the provider configuration:
For omnibus package: For Omnibus package:
```ruby ```ruby
gitlab_rails['omniauth_providers'] = [ gitlab_rails['omniauth_providers'] = [
......
...@@ -17,7 +17,7 @@ in your SAML IdP: ...@@ -17,7 +17,7 @@ in your SAML IdP:
1. On your GitLab server, open the configuration file. 1. On your GitLab server, open the configuration file.
For omnibus package: For Omnibus package:
```sh ```sh
sudo editor /etc/gitlab/gitlab.rb sudo editor /etc/gitlab/gitlab.rb
...@@ -34,7 +34,7 @@ in your SAML IdP: ...@@ -34,7 +34,7 @@ in your SAML IdP:
1. To allow your users to use SAML to sign up without having to manually create 1. To allow your users to use SAML to sign up without having to manually create
an account first, don't forget to add the following values to your configuration: an account first, don't forget to add the following values to your configuration:
For omnibus package: For Omnibus package:
```ruby ```ruby
gitlab_rails['omniauth_enabled'] = true gitlab_rails['omniauth_enabled'] = true
...@@ -54,7 +54,7 @@ in your SAML IdP: ...@@ -54,7 +54,7 @@ in your SAML IdP:
1. You can also automatically link SAML users with existing GitLab users if their 1. You can also automatically link SAML users with existing GitLab users if their
email addresses match by adding the following setting: email addresses match by adding the following setting:
For omnibus package: For Omnibus package:
```ruby ```ruby
gitlab_rails['omniauth_auto_link_saml_user'] = true gitlab_rails['omniauth_auto_link_saml_user'] = true
...@@ -68,7 +68,7 @@ in your SAML IdP: ...@@ -68,7 +68,7 @@ in your SAML IdP:
1. Add the provider configuration: 1. Add the provider configuration:
For omnibus package: For Omnibus package:
```ruby ```ruby
gitlab_rails['omniauth_providers'] = [ gitlab_rails['omniauth_providers'] = [
...@@ -342,7 +342,7 @@ You can add this setting to your GitLab configuration to automatically redirect ...@@ -342,7 +342,7 @@ You can add this setting to your GitLab configuration to automatically redirect
to your SAML server for authentication, thus removing the need to click a button to your SAML server for authentication, thus removing the need to click a button
before actually signing in. before actually signing in.
For omnibus package: For Omnibus package:
```ruby ```ruby
gitlab_rails['omniauth_auto_sign_in_with_provider'] = 'saml' gitlab_rails['omniauth_auto_sign_in_with_provider'] = 'saml'
......
# Shibboleth OmniAuth Provider # Shibboleth OmniAuth Provider
This documentation is for enabling shibboleth with omnibus-gitlab package. This documentation is for enabling Shibboleth with the Omnibus GitLab package.
In order to enable Shibboleth support in gitlab we need to use Apache instead of Nginx (It may be possible to use Nginx, however this is difficult to configure using the bundled Nginx provided in the omnibus-gitlab package). Apache uses mod_shib2 module for shibboleth authentication and can pass attributes as headers to omniauth-shibboleth provider. In order to enable Shibboleth support in GitLab we need to use Apache instead of Nginx (It may be possible to use Nginx, however this is difficult to configure using the bundled Nginx provided in the Omnibus GitLab package). Apache uses mod_shib2 module for Shibboleth authentication and can pass attributes as headers to Omniauth Shibboleth provider.
To enable the Shibboleth OmniAuth provider you must configure Apache shibboleth module. To enable the Shibboleth OmniAuth provider you must configure Apache Shibboleth module.
The installation and configuration of the module itself is out of the scope of this document. The installation and configuration of the module itself is out of the scope of this document.
Check <https://wiki.shibboleth.net/confluence/display/SP3/Apache> for more info. Check <https://wiki.shibboleth.net/confluence/display/SP3/Apache> for more info.
You can find Apache config in gitlab-recipes (<https://gitlab.com/gitlab-org/gitlab-recipes/tree/master/web-server/apache>). You can find Apache config in [GitLab Recipes](https://gitlab.com/gitlab-org/gitlab-recipes/tree/master/web-server/apache).
The following changes are needed to enable Shibboleth: The following changes are needed to enable Shibboleth:
1. Protect omniauth-shibboleth callback URL: 1. Protect Omniauth Shibboleth callback URL:
``` ```
<Location /users/auth/shibboleth/callback> <Location /users/auth/shibboleth/callback>
...@@ -32,7 +32,7 @@ The following changes are needed to enable Shibboleth: ...@@ -32,7 +32,7 @@ The following changes are needed to enable Shibboleth:
</Location> </Location>
``` ```
1. Exclude shibboleth URLs from rewriting. Add `RewriteCond %{REQUEST_URI} !/Shibboleth.sso` and `RewriteCond %{REQUEST_URI} !/shibboleth-sp`. Config should look like this: 1. Exclude Shibboleth URLs from rewriting. Add `RewriteCond %{REQUEST_URI} !/Shibboleth.sso` and `RewriteCond %{REQUEST_URI} !/shibboleth-sp`. Config should look like this:
``` ```
# Apache equivalent of Nginx try files # Apache equivalent of Nginx try files
...@@ -50,7 +50,7 @@ The following changes are needed to enable Shibboleth: ...@@ -50,7 +50,7 @@ The following changes are needed to enable Shibboleth:
attribute mapping. Therefore the values of the `args` hash attribute mapping. Therefore the values of the `args` hash
should be in the form of `"HTTP_ATTRIBUTE"`. The keys in the hash are arguments should be in the form of `"HTTP_ATTRIBUTE"`. The keys in the hash are arguments
to the [OmniAuth::Strategies::Shibboleth class](https://github.com/toyokazu/omniauth-shibboleth/blob/master/lib/omniauth/strategies/shibboleth.rb) to the [OmniAuth::Strategies::Shibboleth class](https://github.com/toyokazu/omniauth-shibboleth/blob/master/lib/omniauth/strategies/shibboleth.rb)
and are documented by the [omniauth-shibboleth gem](https://github.com/toyokazu/omniauth-shibboleth) and are documented by the [`omniauth-shibboleth` gem](https://github.com/toyokazu/omniauth-shibboleth)
(take care to note the version of the gem packaged with GitLab). If some of (take care to note the version of the gem packaged with GitLab). If some of
your users appear to be authenticated by Shibboleth and Apache, but GitLab your users appear to be authenticated by Shibboleth and Apache, but GitLab
rejects their account with a URI that contains "e-mail is invalid" then your rejects their account with a URI that contains "e-mail is invalid" then your
...@@ -94,7 +94,7 @@ On the sign in page, there should now be a "Sign in with: Shibboleth" icon below ...@@ -94,7 +94,7 @@ On the sign in page, there should now be a "Sign in with: Shibboleth" icon below
## Apache 2.4 / GitLab 8.6 update ## Apache 2.4 / GitLab 8.6 update
The order of the first 2 Location directives is important. If they are reversed, The order of the first 2 Location directives is important. If they are reversed,
you will not get a shibboleth session! you will not get a Shibboleth session!
``` ```
<Location /> <Location />
......
...@@ -32,7 +32,7 @@ To enable the Twitter OmniAuth provider you must register your application with ...@@ -32,7 +32,7 @@ To enable the Twitter OmniAuth provider you must register your application with
1. On your GitLab server, open the configuration file. 1. On your GitLab server, open the configuration file.
For omnibus package: For Omnibus package:
```sh ```sh
sudo editor /etc/gitlab/gitlab.rb sudo editor /etc/gitlab/gitlab.rb
...@@ -50,7 +50,7 @@ To enable the Twitter OmniAuth provider you must register your application with ...@@ -50,7 +50,7 @@ To enable the Twitter OmniAuth provider you must register your application with
1. Add the provider configuration: 1. Add the provider configuration:
For omnibus package: For Omnibus package:
```ruby ```ruby
gitlab_rails['omniauth_providers'] = [ gitlab_rails['omniauth_providers'] = [
......
...@@ -25,7 +25,7 @@ To get the credentials (a pair of Client ID and Client Secret), you must registe ...@@ -25,7 +25,7 @@ To get the credentials (a pair of Client ID and Client Secret), you must registe
1. Select **Register application**. 1. Select **Register application**.
1. On your GitLab server, open the configuration file. 1. On your GitLab server, open the configuration file.
For omnibus package: For Omnibus package:
```sh ```sh
sudo editor /etc/gitlab/gitlab.rb sudo editor /etc/gitlab/gitlab.rb
...@@ -41,7 +41,7 @@ To get the credentials (a pair of Client ID and Client Secret), you must registe ...@@ -41,7 +41,7 @@ To get the credentials (a pair of Client ID and Client Secret), you must registe
1. See [Initial OmniAuth Configuration](omniauth.md#initial-omniauth-configuration) for initial settings. 1. See [Initial OmniAuth Configuration](omniauth.md#initial-omniauth-configuration) for initial settings.
1. Add the provider configuration: 1. Add the provider configuration:
For omnibus package: For Omnibus package:
```ruby ```ruby
gitlab_rails['omniauth_providers'] = [ gitlab_rails['omniauth_providers'] = [
......
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
redirect_to: '../user/project/integrations/bamboo.md' redirect_to: '../user/project/integrations/bamboo.md'
--- ---
This document was moved to [user/project/integrations/bamboo.md](../user/project/integrations/bamboo.md). This document was moved to [another location](../user/project/integrations/bamboo.md).
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
redirect_to: '../user/project/integrations/bugzilla.md' redirect_to: '../user/project/integrations/bugzilla.md'
--- ---
This document was moved to [user/project/integrations/bugzilla.md](../user/project/integrations/bugzilla.md). This document was moved to [another location](../user/project/integrations/bugzilla.md).
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
redirect_to: '../user/project/integrations/emails_on_push.md' redirect_to: '../user/project/integrations/emails_on_push.md'
--- ---
This document was moved to [user/project/integrations/emails_on_push.md](../user/project/integrations/emails_on_push.md). This document was moved to [another location](../user/project/integrations/emails_on_push.md).
Поддерживает Markdown
0% или .
You are about to add 0 people to the discussion. Proceed with caution.
Сначала завершите редактирование этого сообщения!
Пожалуйста, зарегистрируйтесь или чтобы прокомментировать