diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-06 09:10:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-06 09:10:35 +0300 |
| commit | 25ceb3dc1c387950d777b71aabde00849d4c7bf9 (patch) | |
| tree | 755188dc8d772ad10fb52f6eaa75a499ee15325a /config | |
| parent | 0fbe2f816ecef98003377154b479d350f13597d7 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 4 | ||||
| -rw-r--r-- | config/mail_room.yml | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 05eab1a9b43..4ff5c3b5179 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -228,6 +228,10 @@ production: &base # client_id: "YOUR-CLIENT-ID" # client_secret: "YOUR-CLIENT-SECRET" + # File that contains the shared secret key for verifying access for mailroom's incoming_email. + # Default is '.gitlab_mailroom_secret' relative to Rails.root (i.e. root of the GitLab app). + # secret_file: /home/git/gitlab/.gitlab_mailroom_secret + ## Consolidated object store config ## This will only take effect if the object_store sections are not defined ## within the types (e.g. artifacts, lfs, etc.). diff --git a/config/mail_room.yml b/config/mail_room.yml index 895438dcc4e..669925c2390 100644 --- a/config/mail_room.yml +++ b/config/mail_room.yml @@ -1,7 +1,7 @@ :mailboxes: <% require_relative "../lib/gitlab/mail_room" unless defined?(Gitlab::MailRoom) - Gitlab::MailRoom.enabled_configs.each do |config| + Gitlab::MailRoom.enabled_configs.each do |_key, config| %> - :host: <%= config[:host].to_json %> |