Commit graph

15 commits

Author SHA1 Message Date
GitLab Bot
bdca097916 Add latest changes from gitlab-org/gitlab@master 2020-08-11 03:11:00 +00:00
GitLab Bot
fa7ac2663b Add latest changes from gitlab-org/gitlab@master 2020-06-24 06:09:01 +00:00
GitLab Bot
c77fda905a Add latest changes from gitlab-org/gitlab@master 2020-02-27 21:09:17 +00:00
GitLab Bot
eca3cd3a9e Add latest changes from gitlab-org/gitlab@master 2019-11-15 18:06:24 +00:00
GitLab Bot
abfafe3c57 Add latest changes from gitlab-org/gitlab@master 2019-10-29 00:06:10 +00:00
Ash McKenzie
19ff9d9899
Replace rails_helper.rb with spec_helper.rb
rails_helper.rb's only logic was to require
spec_helper.rb.
2019-08-30 12:26:18 +10:00
Vladimir Shushlin
6119d5ad75 Don't show private keys for letsencrypt certs
Adds enum certificate_source to pages_domains table
with default manually_uploaded

Mark certificates as 'gitlab_provided'
if the were obtained through Let's Encrypt

Mark certificates as 'user_provided' if they were uploaded through
controller or api

Only show private key in domain edit form if it is 'user_provided'

Only show LetsEncrypt option if is enabled by application settings
(and feature flag)

Refactor and fix some specs to match new logic

Don't show Let's Encrypt certificates as well
2019-06-21 12:06:12 +00:00
blackst0ne
b44a2c801a Update specs to rails5 format
Updates specs to use new rails5 format.

The old format:
`get :show, { some: params }, { some: headers }`

The new format:
`get :show, params: { some: params }, headers: { some: headers }`
2018-12-19 10:04:31 +11:00
Mark Chao
a63bce1a4b Resolve "Rename the Master role to Maintainer" Backend 2018-07-11 14:36:08 +00:00
Rob Watson
9d45951fca Add HTTPS-only pages
Closes #28857
2018-03-22 19:58:36 +01:00
Dmitriy Zaporozhets
86df5c6793
Replace deprecated path_with_namespace with full_path
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2018-03-05 15:41:54 +02:00
Travis Miller
15ca2d5fb5 Fix get a single pages domain when project path contains a period 2018-02-19 00:12:54 -06:00
Luc Didry
78cdac8401 Expose project_id on /api/v4/pages/domains 2018-01-03 19:36:54 +01:00
Travis Miller
1162d89ac4 Add administrative endpoint to list all pages domains 2017-11-13 16:05:44 +00:00
Travis Miller
aca58784bd Add pages domains API tests 2017-10-22 08:04:42 -05:00