diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-22 00:16:43 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-22 00:16:43 +0000 |
commit | 6e3df404ce4365d20af0e06484528b29f92c31a3 (patch) | |
tree | 5c6b3eaf09be6e10611c59cf1209b707c7c9ab76 /spec/features/merge_requests | |
parent | 9fe1a4945b8db40c6b5d7b3ce7c6dbc93cdf67be (diff) | |
download | gitlab-ce-6e3df404ce4365d20af0e06484528b29f92c31a3.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/merge_requests')
-rw-r--r-- | spec/features/merge_requests/user_sorts_merge_requests_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/merge_requests/user_sorts_merge_requests_spec.rb b/spec/features/merge_requests/user_sorts_merge_requests_spec.rb index 58d796f8288..5ccc24ebca1 100644 --- a/spec/features/merge_requests/user_sorts_merge_requests_spec.rb +++ b/spec/features/merge_requests/user_sorts_merge_requests_spec.rb @@ -4,7 +4,7 @@ require 'spec_helper' RSpec.describe 'User sorts merge requests', :js, feature_category: :code_review_workflow do include CookieHelper - include Spec::Support::Helpers::Features::SortingHelpers + include Features::SortingHelpers let!(:merge_request) { create(:merge_request, source_project: project, target_project: project) } let!(:merge_request2) do |