Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 4 deletions

diff --git a/spec/requests/api/npm_group_packages_spec.rb b/spec/requests/api/npm_group_packages_spec.rb
index 431c59cf1b8..fe0bf1d8b46 100644
--- a/spec/requests/api/npm_group_packages_spec.rb
+++ b/spec/requests/api/npm_group_packages_spec.rb
@@ -2,8 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe API::NpmGroupPackages, feature_category: :package_registry,
-  quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/418757' do
+RSpec.describe API::NpmGroupPackages, feature_category: :package_registry do
   using RSpec::Parameterized::TableSyntax
 
   include_context 'npm api setup'
diff --git a/spec/requests/organizations/organizations_controller_spec.rb b/spec/requests/organizations/organizations_controller_spec.rb
index bd54b50de99..c3a328cf3f6 100644
--- a/spec/requests/organizations/organizations_controller_spec.rb
+++ b/spec/requests/organizations/organizations_controller_spec.rb
@@ -30,9 +30,13 @@ RSpec.describe Organizations::OrganizationsController, feature_category: :cell d
       end
 
       context 'when the feature flag `ui_for_organizations` is disabled' do
-        it 'renders 404' do
-          stub_feature_flags(ui_for_organizations: false)
+        let_it_be(:other_user) { create :user }
+
+        before do
+          stub_feature_flags(ui_for_organizations: other_user)
+        end
 
+        it 'renders 404' do
           gitlab_request
 
           expect(response).to have_gitlab_http_status(:not_found)