Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 2 deletions

diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb
index eb05b39a7de..b29a172f5b1 100644
--- a/spec/controllers/projects/issues_controller_spec.rb
+++ b/spec/controllers/projects/issues_controller_spec.rb
@@ -1079,10 +1079,10 @@ RSpec.describe Projects::IssuesController, :request_store, feature_category: :te
     end
 
     context 'when trying to create a task' do
-      it 'defaults to issue type' do
+      it 'sets the correct issue_type' do
         issue = post_new_issue(issue_type: 'task')
 
-        expect(issue.work_item_type.base_type).to eq('issue')
+        expect(issue.work_item_type.base_type).to eq('task')
       end
     end
 
diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb
index 4959c97d649..88d9d1228e3 100644
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
@@ -1093,6 +1093,7 @@ RSpec.describe ProjectsController, feature_category: :groups_and_projects do
           monitor_access_level
           infrastructure_access_level
           model_experiments_access_level
+          model_registry_access_level
         ]
       end