Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
2a296e6d58
commit
414fefc8c4
|
@ -97,8 +97,6 @@ class NotificationRecipient
|
||||||
end
|
end
|
||||||
|
|
||||||
def email_blocked?
|
def email_blocked?
|
||||||
return false if Feature.disabled?(:block_emails_with_failures)
|
|
||||||
|
|
||||||
recipient_email = user.notification_email_for(@group)
|
recipient_email = user.notification_email_for(@group)
|
||||||
|
|
||||||
Gitlab::ApplicationRateLimiter.peek(:permanent_email_failure, scope: recipient_email) ||
|
Gitlab::ApplicationRateLimiter.peek(:permanent_email_failure, scope: recipient_email) ||
|
||||||
|
|
|
@ -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
|
|
|
@ -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.
|
- 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 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 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
|
## Alternative way to import notes and diff notes
|
||||||
|
|
||||||
|
|
|
@ -57,16 +57,6 @@ RSpec.describe NotificationRecipient do
|
||||||
it 'returns false' do
|
it 'returns false' do
|
||||||
expect(recipient.notifiable?).to eq(false)
|
expect(recipient.notifiable?).to eq(false)
|
||||||
end
|
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
|
||||||
|
|
||||||
context 'with temporary failures' do
|
context 'with temporary failures' do
|
||||||
|
@ -77,16 +67,6 @@ RSpec.describe NotificationRecipient do
|
||||||
it 'returns false' do
|
it 'returns false' do
|
||||||
expect(recipient.notifiable?).to eq(false)
|
expect(recipient.notifiable?).to eq(false)
|
||||||
end
|
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
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue