Merge branch 'sh-fix-gitlab-pages-deploy' into 'master'

Fix GitLab Pages deployments not working

Closes #12166 and #121660

See merge request gitlab-org/gitlab!22228

ee/app/services/ee/projects/update_pages_service.rb

@@ -5,7 +5,7 @@ module EE::Projects::UpdatePagesService
 
   override :max_size_from_settings
   def max_size_from_settings
-    return super unless project.feature_available?(:pages_size_limit)
+    return super unless License.feature_available?(:pages_size_limit)
 
     project.closest_setting(:max_pages_size).megabytes
   end