Коммит 244520a2 создал по автору Marc Shaw's avatar Marc Shaw
Просмотр файлов

wip 

Changelog: other
владелец 8a98c839
Скрыть пробелы
Построчно Рядом
app/controllers/projects/merge_requests_controller.rb
Просмотр файла @ 244520a2
......@@ -364,17 +364,10 @@ def auto_merge_requested?
private
# NOTE: Remove this disable with add_prepared_state_to_mr FF removal
# rubocop: disable Metrics/AbcSize
def show_merge_request
close_merge_request_if_no_source_project
@merge_request.check_mergeability(async: true)
if ::Feature.enabled?(:add_prepared_state_to_mr, @merge_request.project) &&
!@merge_request.prepared?
@merge_request.prepare
end
respond_to do |format|
format.html do
# use next to appease Rubocop
......@@ -418,7 +411,6 @@ def show_merge_request
end
end
end
# rubocop: enable Metrics/AbcSize
def render_html_page
preload_assignees_for_render(@merge_request)
......
app/workers/new_merge_request_worker.rb
Просмотр файла @ 244520a2
......@@ -5,7 +5,7 @@ class NewMergeRequestWorker # rubocop:disable Scalability/IdempotentWorker
include NewIssuable
data_consistency :always
sidekiq_options retry: 3
sidekiq_options retry: 10
idempotent!
deduplicate :until_executing
......
config/feature_flags/development/add_prepared_state_to_mr.yml удалено 100644 → 0
Просмотр файла @ 8a98c839
---
name: add_prepared_state_to_mr
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/109967
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/389249
milestone: '15.9'
type: development
group: group::code review
default_enabled: false
spec/controllers/projects/merge_requests_controller_spec.rb
Просмотр файла @ 244520a2
......@@ -68,48 +68,6 @@ def go(extra_params = {})
end
end
context 'when add_prepared_state_to_mr feature flag on' do
before do
stub_feature_flags(add_prepared_state_to_mr: true)
end
context 'when the merge request is not prepared' do
before do
merge_request.update!(prepared_at: nil)
end
it 'prepares the merge request' do
expect(NewMergeRequestWorker).to receive(:perform_async)
go
end
end
context 'when the merge request is prepared' do
before do
merge_request.update!(prepared_at: Time.current)
end
it 'does not re-prepare the merge request' do
expect(NewMergeRequestWorker).not_to receive(:perform_async)
go
end
end
end
context 'when add_prepared_state_to_mr feature flag is off' do
before do
stub_feature_flags(add_prepared_state_to_mr: false)
end
it 'does not prepare the merge request again' do
expect(NewMergeRequestWorker).not_to receive(:perform_async)
go
end
end
describe 'as html' do
it 'sets the endpoint_metadata_url' do
go
......
Поддерживает Markdown
0% или .
You are about to add 0 people to the discussion. Proceed with caution.
Сначала завершите редактирование этого сообщения!
Пожалуйста, зарегистрируйтесь или чтобы прокомментировать