Commit d2eaab03 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'revert-941a175d' into 'master'

Revert "Merge branch 'quarantine-flaky-spec' into 'master'"

See merge request gitlab-org/gitlab!29664
parents 58b0ba62 14e7f996
...@@ -6,7 +6,7 @@ def match_mr1_note(content_regex) ...@@ -6,7 +6,7 @@ def match_mr1_note(content_regex)
MergeRequest.find_by(title: 'MR1').notes.select { |n| n.note.match(/#{content_regex}/)}.first MergeRequest.find_by(title: 'MR1').notes.select { |n| n.note.match(/#{content_regex}/)}.first
end end
describe Gitlab::ImportExport::Project::TreeRestorer, quarantine: { flaky: 'https://gitlab.com/gitlab-org/gitlab/-/issues/213793' } do describe Gitlab::ImportExport::Project::TreeRestorer do
include ImportExport::CommonUtil include ImportExport::CommonUtil
let(:shared) { project.import_export_shared } let(:shared) { project.import_export_shared }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment