diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-24 21:09:18 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-24 21:09:18 +0300 |
| commit | 8015f09545c35b833f4955fc2e0b8f1a3214cbcb (patch) | |
| tree | e28c5add700b9f3d12eabe1361889545785b29d4 /config | |
| parent | 8e1bb8745bafe36f273ce4a095c3576c38ceb8b4 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/force_no_sharing_primary_model.yml | 8 | ||||
| -rw-r--r-- | config/mail_room.yml | 1 |
2 files changed, 1 insertions, 8 deletions
diff --git a/config/feature_flags/development/force_no_sharing_primary_model.yml b/config/feature_flags/development/force_no_sharing_primary_model.yml deleted file mode 100644 index 5732f39fdee..00000000000 --- a/config/feature_flags/development/force_no_sharing_primary_model.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: force_no_sharing_primary_model -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76188 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/347286 -milestone: '14.8' -type: development -group: group::sharding -default_enabled: false diff --git a/config/mail_room.yml b/config/mail_room.yml index 49cb765ebe6..1e76f5e9875 100644 --- a/config/mail_room.yml +++ b/config/mail_room.yml @@ -46,6 +46,7 @@ :delivery_method: postback :delivery_options: :delivery_url: <%= config[:gitlab_url] %>/api/v4/internal/mail_room/<%= key %> + :content_type: text/plain :jwt_auth_header: <%= Gitlab::MailRoom::INTERNAL_API_REQUEST_HEADER %> :jwt_issuer: <%= Gitlab::MailRoom::INTERNAL_API_REQUEST_JWT_ISSUER %> :jwt_algorithm: "HS256" |