diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-21 15:10:22 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-21 15:10:22 +0300 |
| commit | 9e68395a98e71e2a0e9a6200f15ad1e7bae9ea87 (patch) | |
| tree | b8508b7503f056b2438cc2fef6f2f9b1edfa0279 /config | |
| parent | 202268ad93e9a1556f5700326be5ec89bd641a97 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/personal_snippet_reference_filters.yml | 4 | ||||
| -rw-r--r-- | config/gitlab.yml.example | 5 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 6 | ||||
| -rw-r--r-- | config/initializers/gitlab_kas_secret.rb | 1 |
4 files changed, 14 insertions, 2 deletions
diff --git a/config/feature_flags/development/personal_snippet_reference_filters.yml b/config/feature_flags/development/personal_snippet_reference_filters.yml index 6a9aefbb379..44b9ac2f862 100644 --- a/config/feature_flags/development/personal_snippet_reference_filters.yml +++ b/config/feature_flags/development/personal_snippet_reference_filters.yml @@ -1,7 +1,7 @@ --- name: personal_snippet_reference_filters -introduced_by_url: +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38571 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/235155 group: group::editor type: development -default_enabled: false
\ No newline at end of file +default_enabled: false diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 5d217332634..19dcea84d86 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -1093,6 +1093,11 @@ production: &base # Default is '.gitlab_workhorse_secret' relative to Rails.root (i.e. root of the GitLab app). # secret_file: /home/git/gitlab/.gitlab_workhorse_secret + gitlab_kas: + # File that contains the secret key for verifying access for gitlab-kas. + # Default is '.gitlab_kas_secret' relative to Rails.root (i.e. root of the GitLab app). + # secret_file: /home/git/gitlab/.gitlab_kas_secret + ## GitLab Elasticsearch settings elasticsearch: indexer_path: /home/git/gitlab-elasticsearch-indexer/ diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 628d9c65ce0..da275b34f5d 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -635,6 +635,12 @@ Settings['workhorse'] ||= Settingslogic.new({}) Settings.workhorse['secret_file'] ||= Rails.root.join('.gitlab_workhorse_secret') # +# GitLab KAS +# +Settings['gitlab_kas'] ||= Settingslogic.new({}) +Settings.gitlab_kas['secret_file'] ||= Rails.root.join('.gitlab_kas_secret') + +# # Repositories # Settings['repositories'] ||= Settingslogic.new({}) diff --git a/config/initializers/gitlab_kas_secret.rb b/config/initializers/gitlab_kas_secret.rb new file mode 100644 index 00000000000..5e86e954684 --- /dev/null +++ b/config/initializers/gitlab_kas_secret.rb @@ -0,0 +1 @@ +Gitlab::Kas.ensure_secret! |