Commit 6909b4f6 authored by Craig Norris's avatar Craig Norris

Merge branch 'aqualls-add-authorise-spellings' into 'master'

Test for British spellings of authorize

See merge request gitlab-org/gitlab!74113
parents 1c9e7b7a 9317c27a
...@@ -19,6 +19,10 @@ swap: ...@@ -19,6 +19,10 @@ swap:
analyse: analyze analyse: analyze
annexe: annex annexe: annex
apologise: apologize apologise: apologize
authorise: authorize
authorised: authorized
authorisation: authorization
authorising: authorizing
behaviour: behavior behaviour: behavior
busses: buses busses: buses
calibre: caliber calibre: caliber
......
...@@ -84,7 +84,7 @@ could not authorize you from Crowd because invalid credentials ...@@ -84,7 +84,7 @@ could not authorize you from Crowd because invalid credentials
``` ```
Ensure the Crowd users who need to sign in to GitLab are authorized to the Ensure the Crowd users who need to sign in to GitLab are authorized to the
[application](#configure-a-new-crowd-application) in the **Authorisation** step. [application](#configure-a-new-crowd-application) in the **Authorization** step.
This could be verified by trying "Authentication test" for Crowd (as of 2.11). This could be verified by trying "Authentication test" for Crowd (as of 2.11).
![Example Crowd application authorisation configuration](img/crowd_application_authorisation.png) ![Example Crowd application authorization configuration](img/crowd_application_authorisation.png)
...@@ -595,7 +595,7 @@ response = GitLab::HTTP.perform_request(Net::HTTP::Get, 'https://gitlab.com', ss ...@@ -595,7 +595,7 @@ response = GitLab::HTTP.perform_request(Net::HTTP::Get, 'https://gitlab.com', ss
##### TLS 1.2 ##### TLS 1.2
**Golang** does support multiple cipher suites that we do not want to use with TLS 1.2. We need to explicitly list authorised ciphers: **Golang** does support multiple cipher suites that we do not want to use with TLS 1.2. We need to explicitly list authorized ciphers:
```golang ```golang
func secureCipherSuites() []uint16 { func secureCipherSuites() []uint16 {
......
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