diff options
| author | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2022-02-26 00:59:19 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2022-02-26 00:59:19 +0300 |
| commit | ee98d5353d02654dc39c0d3534c04699e5aaab43 (patch) | |
| tree | 4e997cb7fa3b0bf71689e11b95245424a431d96c /config | |
| parent | 479d579719c36f1b8706165c20f4525bc32bb451 (diff) | |
| parent | c7be43f6dd37211709111be3796af9e1f00d3713 (diff) | |
Merge remote-tracking branch 'dev/14-8-stable' into 14-8-stable
Diffstat (limited to 'config')
3 files changed, 17 insertions, 0 deletions
diff --git a/config/feature_flags/development/groups_runners_token_prefix.yml b/config/feature_flags/development/groups_runners_token_prefix.yml new file mode 100644 index 00000000000..87b87266673 --- /dev/null +++ b/config/feature_flags/development/groups_runners_token_prefix.yml @@ -0,0 +1,8 @@ +--- +name: groups_runners_token_prefix +introduced_by_url: +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353805 +milestone: '14.9' +type: development +group: group::database +default_enabled: true diff --git a/config/feature_flags/development/projects_runners_token_prefix.yml b/config/feature_flags/development/projects_runners_token_prefix.yml new file mode 100644 index 00000000000..5dd21d115f6 --- /dev/null +++ b/config/feature_flags/development/projects_runners_token_prefix.yml @@ -0,0 +1,8 @@ +--- +name: projects_runners_token_prefix +introduced_by_url: +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/353805 +milestone: '14.9' +type: development +group: group::database +default_enabled: true diff --git a/config/initializers/action_mailer_hooks.rb b/config/initializers/action_mailer_hooks.rb index 46d5e387d9d..fb09ed34bf6 100644 --- a/config/initializers/action_mailer_hooks.rb +++ b/config/initializers/action_mailer_hooks.rb @@ -8,6 +8,7 @@ end ActionMailer::Base.register_interceptors( ::Gitlab::Email::Hook::AdditionalHeadersInterceptor, ::Gitlab::Email::Hook::EmailTemplateInterceptor, + ::Gitlab::Email::Hook::ValidateAddressesInterceptor, ::Gitlab::Email::Hook::DeliveryMetricsObserver ) |