117 Commits

Author SHA1 Message Date
orvice
e2d7d726f5 add artifacts:direct_upload back
that was removed at: 9ec381b3ef (diff-c23ee6433bb041af815df0457df129d0L175)
2020-06-05 18:23:28 +02:00
Carlos Álvaro
74013d82ab feat: Add healthcheck for gitlab service 2020-05-26 18:10:55 +02:00
solidnerd
ae6fad48c4 chore: sync configs 2020-05-25 06:56:20 +02:00
solidnerd
45d638a884 fix: duplicate remote directory key and aws encryption settings 2020-05-21 11:36:41 +02:00
Sameer Naik
25cb2e7466 gitlab: upgrade to 12.10.4 2020-05-16 08:04:45 +02:00
Sameer Naik
9ec381b3ef sync: upstream configs 2020-05-16 08:04:45 +02:00
Niclas Mietz
67a5fc30b4
Upgrade to 12.8.0 (#2090)
* Upgrade GitLab CE to 12.8.0

* Update gitlab-workhorse to 8.21.0

Signed-off-by: solidnerd <niclas@mietz.io>

* Update gitlab-pages to 1.16.0

Signed-off-by: solidnerd <niclas@mietz.io>

* Update gitaly to 12.8.0

Signed-off-by: solidnerd <niclas@mietz.io>

* fix: gitaly-hooks missing symlink

Signed-off-by: solidnerd <niclas@mietz.io>

* chore(base-image): update base image to 20200219

* fix: unicorn worker limits

Signed-off-by: solidnerd <niclas@mietz.io>

* fix(ci): disable caching

Signed-off-by: solidnerd <niclas@mietz.io>

* feat: add patch support for gitlab during the installation

Signed-off-by: solidnerd <niclas@mietz.io>

* fix: ArgumentError: 'import/{{oauth2_generic_name}}' is not a supported controller name

Closes #2101

Signed-off-by: solidnerd <niclas@mietz.io>

* fix: add fix for upstream gitaly problems during a fresh install

Signed-off-by: solidnerd <niclas@mietz.io>

* chore: update changelog.md
2020-03-29 15:29:09 +02:00
Bart Joris
2ea27eef81
Add Generic OAuth2 provider (#2070)
* Add Generic OAuth2 provider

* Add docs to test Keycloak on a local environment

* Update docs for oauth2_generic
2020-03-12 09:05:21 +01:00
pbe-axelor
73cb6392fd Add S/MIME Email Signing (#2009)
* Add S/MIME Email Signing

See https://docs.gitlab.com/ce/administration/smime_signing_email.html

Signed-off-by: Pierre Belloy <p.belloy@axelor.com>

* Remove s/mime email configs if not enabled

Signed-off-by: Pierre Belloy <p.belloy@axelor.com>
2019-09-26 06:58:29 +02:00
Pierre Belloy
97ec6e337a Set Sidekiq default log format to json
This follow gitlab default value.
See https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/32842

Signed-off-by: Pierre Belloy <p.belloy@axelor.com>
2019-09-24 11:36:58 +02:00
sue445
edfe1492e2 Add Sentry configuration to gitlab.yml 2019-09-24 07:07:19 +02:00
Julien Grenier
9d8903a523 Fix Auth0 config (#1964)
Fix Auth0 configuration and Add OAUTH_AUTH0_SCOPE
2019-09-24 07:04:13 +02:00
Bartosz Cisek
be45df494d Add support for AWS S3 signature version
Some 3rd party storage solutions allow upload via S3 protocol but still
use v2 of signature schema. [Fog library used by gitlab](https://docs.gitlab.com/ee/administration/uploads.html#s3-compatible-connection-settings)
allows to override default version 4.
2019-07-13 13:24:12 +02:00
David Rubin
76bfb2f1e0 Support Google Cloud Object Store 2019-03-06 07:21:53 +01:00
Pierre Belloy
13e856141e ADD GITLAB_IMPERSONATION_ENABLED
Signed-off-by: Pierre Belloy <p.belloy@axelor.com>
2019-01-02 13:47:35 +01:00
Alexander Trost
ec4df3a82f Added OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME
Signed-off-by: Alexander Trost <galexrt@googlemail.com>
2019-01-02 13:43:43 +01:00
solidnerd
33ef7ffde8
Add LDAP_USER_ATTRIBUTE_*
This will add misssing options to configure LDAP_USER_ATTRIBUTES

These will fix several Issues and merge multiple merge requests.

Fixes sameersbn#699
Fixes sameersbn#1746
Fixes sameersbn#1814

Signed-off-by: solidnerd <niclas@mietz.io>
2018-12-29 00:06:15 +01:00
Gert-Jan Timmer
0a8f6bd872 Add: gitlab pages access control (11.5)
Added gitlab pages access control (Introduced in gitlab 11.5).

Fixes: #1769
2018-11-25 17:09:18 +01:00
Maycon Lopes dos Santos
7f24c384fb Added GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD to the templates
GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD description

fix number of args
2018-11-06 19:24:04 -02:00
Tobias Haber
91e05e4489
Add GITLAB_DEFAULT_THEME 2018-09-01 11:00:01 +02:00
lucianomores
07094553f0 Fix uploads object storage aws endpoint variable 2018-05-15 11:43:49 -03:00
solidnerd
0bf46bf73b
Add GITLAB_UPLOADS_OBJECT_STORE_*
Signed-off-by: solidnerd <niclas@mietz.io>
2018-04-29 10:49:51 +02:00
solidnerd
79eb0a7e9a
Add GITLAB_LFS_OBJECT_STORE_*
Signed-off-by: solidnerd <niclas@mietz.io>
2018-04-29 10:49:51 +02:00
solidnerd
fdc26d2dd5
Add GITLAB_ARTIFACTS_OBJECT_STORE_*
Signed-off-by: solidnerd <niclas@mietz.io>
2018-04-29 10:49:51 +02:00
solidnerd
6111c2e375
Add GITLAB_SIDEKIQ_LOG_FORMAT
Signed-off-by: solidnerd <niclas@mietz.io>
2018-04-29 10:49:51 +02:00
solidnerd
b4bb8536c7
Sync upstream gitlab.yml
Signed-off-by: solidnerd <niclas@mietz.io>
2018-02-25 12:44:42 +01:00
solidnerd
96e2a8fca6
Add LDAP_LOWERCASE_USERNAMES
Signed-off-by: solidnerd <niclas@mietz.io>
2018-02-25 12:44:42 +01:00
solidnerd
52b669a7a3
Add GITLAB_UPLOADS_STORAGE_PATH and GITLAB_UPLOADS_BASE_DIR 2018-02-25 12:44:29 +01:00
David Rubin
14c3225d03 Add AWS_BACKUP_STORAGE_CLASS configuration option 2017-12-29 16:46:58 +01:00
David Rubin
5ea41eb3d6 Add AWS_BACKUP_ENCRYPTION ENV to enable aws backup aes encryption backups
Also refactor the multi part config to match
2017-12-29 16:42:15 +01:00
David Rubin
94d5f687df Remove multipart configs if AWS_BACKUP_MULTIPART_CHUNK_SIZE is not set 2017-12-29 16:16:22 +01:00
David Rubin
a3a23a4bc6 Correct template file for AWS_BACKUP_MULTIPART_CHUNK_SIZE env
Fixes #1293

Correctly setup and configure the template in order to use chunked
upload.
2017-12-26 20:53:06 +01:00
solidnerd
cf29d0676b
Update gitlab.yml to upstream
Signed-off-by: solidnerd <niclas@mietz.io>
2017-12-26 11:20:05 +01:00
solidnerd
1f02a1b54c
Remove GITLAB_TIMEOUT
Signed-off-by: solidnerd <niclas@mietz.io>
2017-12-26 11:20:05 +01:00
solidnerd
c04ee489d9
Remove GITLAB_MAX_OBJECT_SIZE
Signed-off-by: solidnerd <niclas@mietz.io>
2017-12-26 11:20:05 +01:00
solidnerd
8d29eb22af
Remove GITLAB_REPOSITORIES_STORAGES_DEFAULT_STORAGE_TIMEOUT
Signed-off-by: solidnerd <niclas@mietz.io>
2017-12-26 11:20:05 +01:00
solidnerd
91157bca06
Remove GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_RESET_TIME
Signed-off-by: solidnerd <niclas@mietz.io>
2017-12-26 11:20:05 +01:00
solidnerd
7a9d333b2d
Remove GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_WAIT_TIME
Signed-off-by: solidnerd <niclas@mietz.io>
2017-12-26 11:20:04 +01:00
solidnerd
a705e5f03f
Remove GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_COUNT_THRESHOLD
Signed-off-by: solidnerd <niclas@mietz.io>
2017-12-26 11:20:04 +01:00
Bertrand Gouny
cb48a6aff0 ldap ca_file and ssl_version config params 2017-10-30 14:27:33 +01:00
solidnerd
311dc66915
Update gitlab.yml from upstream
Signed-off-by: solidnerd <niclas@mietz.io>
2017-10-26 21:47:53 +02:00
solidnerd
f765ef06be
Add GITLAB_PAGES_ARTIFACTS_SERVER
Signed-off-by: solidnerd <niclas@mietz.io>
2017-10-26 21:47:53 +02:00
solidnerd
df4d252cc9
Add GITLAB_PAGES_CLIENT_PATH
Signed-off-by: solidnerd <niclas@mietz.io>
2017-10-26 21:47:53 +02:00
solidnerd
c570f1c196
Remove GITALY_ENABLED
Since the last version Gitaly is now the way to go. So I removed this variable from the image.

Signed-off-by: solidnerd <niclas@mietz.io>
2017-10-26 21:47:53 +02:00
solidnerd
295ec223e7
Syntax mistake on LDAP_VERIFY_SSL
Deleting quotes on LDAP_VERIFY_SSL

Signed-off-by: solidnerd <niclas@mietz.io>
# Conflicts:
#	assets/runtime/config/gitlabhq/gitlab.yml
2017-10-20 22:06:05 +02:00
BirgerK
bdb4dbd18f fix possible values for ldap-encryption 2017-10-19 23:32:39 +02:00
LordFPL
1cd2d70082 Add LDAP_VERIFY_SSL var (#1367)
* Add LDAP_VERIFY_SSL var

Due to https://about.gitlab.com/2017/09/22/gitlab-10-0-released/#ldap-config-%22verify_certificates%22-defaults-to-secure, this config should be present.

* Update env-defaults

* Update functions

* Update README.md
2017-10-08 12:58:17 +03:00
Silas Rech
cd97f7ca0e
Fix some whitespace / tab issues 2017-08-24 16:58:26 +02:00
Silas Rech
5c2e00e2ec
Add monitoring keys 2017-08-24 16:50:32 +02:00
Max
1b09ce0bef
Add config vars for the gitaly token & gitlab repository timeout/reset 2017-08-23 22:59:37 +02:00