From 414fefc8c437ab2e4dc768e675d0e914241c06bc Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 7 Oct 2022 12:09:35 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- app/models/notification_recipient.rb | 2 -- .../block_emails_with_failures.yml | 8 -------- doc/user/project/import/github.md | 3 ++- spec/models/notification_recipient_spec.rb | 20 ------------------- 4 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 config/feature_flags/development/block_emails_with_failures.yml diff --git a/app/models/notification_recipient.rb b/app/models/notification_recipient.rb index caa24377791..20d5a5ae1a1 100644 --- a/app/models/notification_recipient.rb +++ b/app/models/notification_recipient.rb @@ -97,8 +97,6 @@ class NotificationRecipient end def email_blocked? - return false if Feature.disabled?(:block_emails_with_failures) - recipient_email = user.notification_email_for(@group) Gitlab::ApplicationRateLimiter.peek(:permanent_email_failure, scope: recipient_email) || diff --git a/config/feature_flags/development/block_emails_with_failures.yml b/config/feature_flags/development/block_emails_with_failures.yml deleted file mode 100644 index c06d49346b3..00000000000 --- a/config/feature_flags/development/block_emails_with_failures.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: block_emails_with_failures -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96902 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/373159 -milestone: '15.4' -type: development -group: group::project management -default_enabled: false diff --git a/doc/user/project/import/github.md b/doc/user/project/import/github.md index 818cd7e1b74..0ae6e828086 100644 --- a/doc/user/project/import/github.md +++ b/doc/user/project/import/github.md @@ -201,7 +201,8 @@ Supported GitHub branch protection rules are mapped to GitLab branch protection - GitHub rule **Require conversation resolution before merging** for the project's default branch is mapped to the [**All threads must be resolved** GitLab setting](../../discussions/index.md#prevent-merge-unless-all-threads-are-resolved). [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/371110) in GitLab 15.5. - Support for GitHub rule **Require a pull request before merging** is proposed in issue [370951](https://gitlab.com/gitlab-org/gitlab/-/issues/370951). - Support for GitHub rule **Require signed commits** is proposed in issue [370949](https://gitlab.com/gitlab-org/gitlab/-/issues/370949). -- Support for GitHub rule **Require status checks to pass before merging** is proposed in issue [370948](https://gitlab.com/gitlab-org/gitlab/-/issues/370948). +- Support for GitHub rule **Require status checks to pass before merging** was proposed in issue [370948](https://gitlab.com/gitlab-org/gitlab/-/issues/370948). However, this rule cannot be translated during project import into GitLab due to technical difficulties. +You can still create [status checks](../merge_requests/status_checks.md) in GitLab yourself. ## Alternative way to import notes and diff notes diff --git a/spec/models/notification_recipient_spec.rb b/spec/models/notification_recipient_spec.rb index 8105262aada..068166ebb0d 100644 --- a/spec/models/notification_recipient_spec.rb +++ b/spec/models/notification_recipient_spec.rb @@ -57,16 +57,6 @@ RSpec.describe NotificationRecipient do it 'returns false' do expect(recipient.notifiable?).to eq(false) end - - context 'when block_emails_with_failures is disabled' do - before do - stub_feature_flags(block_emails_with_failures: false) - end - - it 'returns true' do - expect(recipient.notifiable?).to eq(true) - end - end end context 'with temporary failures' do @@ -77,16 +67,6 @@ RSpec.describe NotificationRecipient do it 'returns false' do expect(recipient.notifiable?).to eq(false) end - - context 'when block_emails_with_failures is disabled' do - before do - stub_feature_flags(block_emails_with_failures: false) - end - - it 'returns true' do - expect(recipient.notifiable?).to eq(true) - end - end end end end