diff options
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | doc/development/README.md | 2 | ||||
| -rw-r--r-- | doc/university/support/README.md | 2 | ||||
| -rw-r--r-- | doc/user/group/saml_sso/index.md | 2 | ||||
| -rw-r--r-- | spec/controllers/concerns/send_file_upload_spec.rb | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index bab758a348b..4cebf73f17a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -499,7 +499,7 @@ GEM method_source (0.9.2) mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2018.0812) + mime-types-data (3.2019.0331) mimemagic (0.3.2) mini_magick (4.8.0) mini_mime (1.0.1) diff --git a/doc/development/README.md b/doc/development/README.md index d2f09fc01de..b7322ab731f 100644 --- a/doc/development/README.md +++ b/doc/development/README.md @@ -35,7 +35,7 @@ description: 'Learn how to contribute to GitLab.' - [API styleguide](api_styleguide.md) Use this styleguide if you are contributing to the API. - [GraphQL API styleguide](api_graphql_styleguide.md) Use this - styleguide if you are contribution to the [GraphQL API](../api/graphql/index.md) + styleguide if you are contributing to the [GraphQL API](../api/graphql/index.md) - [Sidekiq guidelines](sidekiq_style_guide.md) for working with Sidekiq workers - [Working with Gitaly](gitaly.md) - [Manage feature flags](feature_flags.md) diff --git a/doc/university/support/README.md b/doc/university/support/README.md index 9563492c137..35e65b60768 100644 --- a/doc/university/support/README.md +++ b/doc/university/support/README.md @@ -145,7 +145,7 @@ Zendesk is our Support Centre and our main communication line with our Customers Some tickets need specific knowledge or a deep understanding of a particular component and will need to be escalated to a Senior Service Engineer or Developer -- Read about [Escalation](https://about.gitlab.com/handbook/support/onboarding/#create-issuesa-namecreate-issuea) +- Read about [Escalation](https://about.gitlab.com/handbook/support/workflows/shared/support_workflows/issue_escalations.html) - Find the macros in Zendesk for ticket escalations - Take a look at the [GitLab.com Team page](https://about.gitlab.com/team/) to find the resident experts in their fields diff --git a/doc/user/group/saml_sso/index.md b/doc/user/group/saml_sso/index.md index fcfd638f185..26893f7e31e 100644 --- a/doc/user/group/saml_sso/index.md +++ b/doc/user/group/saml_sso/index.md @@ -35,6 +35,8 @@ SSO enforcement was: With this option enabled, users must use your group's GitLab single sign on URL to be added to the group or be added via SCIM. Users cannot be added manually, and may only access project/group resources via the UI by signing in through the SSO URL. +However, users will not be prompted to log via SSO on each visit. GitLab will check whether a user has authenticated through the SSO link, and will only prompt the user to login via SSO if it has been longer than 7 days. + We intend to add a similar SSO requirement for [Git and API activity](https://gitlab.com/gitlab-org/gitlab-ee/issues/9152) in the future. ### NameID diff --git a/spec/controllers/concerns/send_file_upload_spec.rb b/spec/controllers/concerns/send_file_upload_spec.rb index a3ce08f736c..3bf0ec799c7 100644 --- a/spec/controllers/concerns/send_file_upload_spec.rb +++ b/spec/controllers/concerns/send_file_upload_spec.rb @@ -115,7 +115,7 @@ describe SendFileUpload do it 'sends a file with a custom type' do headers = double - expected_headers = /response-content-disposition=attachment%3B%20filename%3D%22test.js%22%3B%20filename%2A%3DUTF-8%27%27test.js&response-content-type=application%2Fecmascript/ + expected_headers = /response-content-disposition=attachment%3B%20filename%3D%22test.js%22%3B%20filename%2A%3DUTF-8%27%27test.js&response-content-type=application%2Fjavascript/ expect(Gitlab::Workhorse).to receive(:send_url).with(expected_headers).and_call_original expect(headers).to receive(:store).with(Gitlab::Workhorse::SEND_DATA_HEADER, /^send-url:/) |