Add latest changes from gitlab-org/gitlab@master

5 files changed, 7 insertions, 4 deletions

diff --git a/app/controllers/projects/pages_controller.rb b/app/controllers/projects/pages_controller.rb
index 13c2a3ab750..332d33b8e52 100644
--- a/app/controllers/projects/pages_controller.rb
+++ b/app/controllers/projects/pages_controller.rb
@@ -77,7 +77,7 @@ class Projects::PagesController < Projects::ApplicationController
   def project_params_attributes
     attributes = %i[pages_https_only]
 
-    return attributes unless Feature.enabled?(:pages_unique_domain)
+    return attributes unless Feature.enabled?(:pages_unique_domain, @project)
 
     attributes + [
       project_setting_attributes: [
diff --git a/app/graphql/mutations/members/projects/bulk_update.rb b/app/graphql/mutations/members/projects/bulk_update.rb
index cfb88e60c44..9bf7968670e 100644
--- a/app/graphql/mutations/members/projects/bulk_update.rb
+++ b/app/graphql/mutations/members/projects/bulk_update.rb
@@ -5,6 +5,9 @@ module Mutations
     module Projects
       class BulkUpdate < BulkUpdateBase
         graphql_name 'ProjectMemberBulkUpdate'
+        description 'Updates multiple members of a project. ' \
+                    'To use this mutation, you must have at least the Maintainer role.'
+
         authorize :admin_project_member
 
         field :project_members,
diff --git a/app/models/project.rb b/app/models/project.rb
index f50395a4acd..b0e01fda0c2 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -3170,7 +3170,7 @@ class Project < ApplicationRecord
   private
 
   def pages_unique_domain_enabled?
-    Feature.enabled?(:pages_unique_domain) &&
+    Feature.enabled?(:pages_unique_domain, self) &&
       project_setting.pages_unique_domain_enabled?
   end
 
diff --git a/app/services/projects/update_service.rb b/app/services/projects/update_service.rb
index bea994e8bb2..866163fe5ba 100644
--- a/app/services/projects/update_service.rb
+++ b/app/services/projects/update_service.rb
@@ -51,7 +51,7 @@ module Projects
     private
 
     def add_pages_unique_domain
-      if Feature.disabled?(:pages_unique_domain)
+      if Feature.disabled?(:pages_unique_domain, project)
         params[:project_setting_attributes]&.delete(:pages_unique_domain_enabled)
 
         return
diff --git a/app/views/projects/pages/_pages_settings.html.haml b/app/views/projects/pages/_pages_settings.html.haml
index 11e105d349d..4c8ec21db39 100644
--- a/app/views/projects/pages/_pages_settings.html.haml
+++ b/app/views/projects/pages/_pages_settings.html.haml
@@ -17,7 +17,7 @@
       %p.gl-pl-6
         = s_("GitLabPages|When enabled, all attempts to visit your website through HTTP are automatically redirected to HTTPS using a response with status code 301. Requires a valid certificate for all domains. %{docs_link_start}Learn more.%{link_end}").html_safe % { docs_link_start: docs_link_start, link_end: link_end }
 
-  - if Feature.enabled?(:pages_unique_domain)
+  - if Feature.enabled?(:pages_unique_domain, @project)
     .form-group
       = f.fields_for :project_setting do |settings|
         = settings.gitlab_ui_checkbox_component :pages_unique_domain_enabled,