Automatic merge of gitlab-org/gitlab master

app/services/projects/update_pages_service.rb

@@ -37,14 +37,13 @@ module Projects
         job.run!
       end
 
-      raise InvalidStateError, 'missing pages artifacts' unless build.artifacts?
-      raise InvalidStateError, 'build SHA is outdated for this ref' unless latest?
+      validate_state!
+      validate_max_size!
+      validate_max_entries!
 
       build.artifacts_file.use_file do |artifacts_path|
         deploy_to_legacy_storage(artifacts_path)
-
         create_pages_deployment(artifacts_path, build)
-
         success
       end
     rescue InvalidStateError => e
@@ -92,8 +91,10 @@ module Projects
 
         # Check if we did extract public directory
         archive_public_path = File.join(tmp_path, PUBLIC_DIR)
+
         raise InvalidStateError, 'pages miss the public folder' unless Dir.exist?(archive_public_path)
-        raise InvalidStateError, 'build SHA is outdated for this ref' unless latest?
+
+        validate_outdated_sha!
 
         deploy_page!(archive_public_path)
       end
@@ -108,15 +109,6 @@ module Projects
     end
 
     def extract_zip_archive!(artifacts_path, temp_path)
-      raise InvalidStateError, 'missing artifacts metadata' unless build.artifacts_metadata?
-
-      # Calculate page size after extract
-      public_entry = build.artifacts_metadata_entry(PUBLIC_DIR + '/', recursive: true)
-
-      if public_entry.total_size > max_size
-        raise InvalidStateError, "artifacts for pages are too large: #{public_entry.total_size}"
-      end
-
       SafeZip::Extract.new(artifacts_path)
         .extract(directories: [PUBLIC_DIR], to: temp_path)
     rescue SafeZip::Extract::Error => e
@@ -151,10 +143,6 @@ module Projects
     end
 
     def create_pages_deployment(artifacts_path, build)
-      # we're using the full archive and pages daemon needs to read it
-      # so we want the total count from entries, not only "public/" directory
-      # because it better approximates work we need to do before we can serve the site
-      entries_count = build.artifacts_metadata_entry("", recursive: true).entries.count
       sha256 = build.job_artifacts_archive.file_sha256
 
       deployment = nil
@@ -163,7 +151,7 @@ module Projects
                                                        file_count: entries_count,
                                                        file_sha256: sha256)
 
-        raise InvalidStateError, 'build SHA is outdated for this ref' unless latest?
+        validate_outdated_sha!
 
         project.update_pages_deployment!(deployment)
       end
@@ -175,29 +163,6 @@ module Projects
       )
     end
 
-    def latest?
-      # check if sha for the ref is still the most recent one
-      # this helps in case when multiple deployments happens
-      sha == latest_sha
-    end
-
-    def blocks
-      # Calculate dd parameters: we limit the size of pages
-      1 + max_size / BLOCK_SIZE
-    end
-
-    def max_size_from_settings
-      Gitlab::CurrentSettings.max_pages_size.megabytes
-    end
-
-    def max_size
-      max_pages_size = max_size_from_settings
-
-      return ::Gitlab::Pages::MAX_SIZE if max_pages_size == 0
-
-      max_pages_size
-    end
-
     def tmp_path
       @tmp_path ||= File.join(::Settings.pages.path, TMP_EXTRACT_PATH)
     end
@@ -262,6 +227,65 @@ module Projects
     def tmp_dir_prefix
       "project-#{project.id}-build-#{build.id}-"
     end
+
+    def validate_state!
+      raise InvalidStateError, 'missing pages artifacts' unless build.artifacts?
+      raise InvalidStateError, 'missing artifacts metadata' unless build.artifacts_metadata?
+
+      validate_outdated_sha!
+    end
+
+    def validate_outdated_sha!
+      raise InvalidStateError, 'build SHA is outdated for this ref' unless latest?
+    end
+
+    def latest?
+      # check if sha for the ref is still the most recent one
+      # this helps in case when multiple deployments happens
+      sha == latest_sha
+    end
+
+    def validate_max_size!
+      if total_size > max_size
+        raise InvalidStateError, "artifacts for pages are too large: #{total_size}"
+      end
+    end
+
+    # Calculate page size after extract
+    def total_size
+      @total_size ||= build.artifacts_metadata_entry(PUBLIC_DIR + '/', recursive: true).total_size
+    end
+
+    def max_size_from_settings
+      Gitlab::CurrentSettings.max_pages_size.megabytes
+    end
+
+    def max_size
+      max_pages_size = max_size_from_settings
+
+      return ::Gitlab::Pages::MAX_SIZE if max_pages_size == 0
+
+      max_pages_size
+    end
+
+    def validate_max_entries!
+      if pages_file_entries_limit > 0 && entries_count > pages_file_entries_limit
+        raise InvalidStateError, "pages site contains #{entries_count} file entries, while limit is set to #{pages_file_entries_limit}"
+      end
+    end
+
+    def entries_count
+      # we're using the full archive and pages daemon needs to read it
+      # so we want the total count from entries, not only "public/" directory
+      # because it better approximates work we need to do before we can serve the site
+      @entries_count = build.artifacts_metadata_entry("", recursive: true).entries.count
+    end
+
+    def pages_file_entries_limit
+      return 0 unless Feature.enabled?(:pages_limit_entries_count, project, default_enabled: :yaml)
+
+      project.actual_limits.pages_file_entries
+    end
   end
 end
 

app/views/admin/application_settings/_pages.html.haml

@@ -2,43 +2,49 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group
-      = f.label :max_pages_size, _('Maximum size of pages (MB)'), class: 'label-bold'
-      = f.number_field :max_pages_size, class: 'form-control gl-form-input'
-      .form-text.text-muted
-        = _("0 for unlimited")
     .form-group
       .form-check
         = f.check_box :pages_domain_verification_enabled, class: 'form-check-input'
         = f.label :pages_domain_verification_enabled, class: 'form-check-label' do
-          = _("Require users to prove ownership of custom domains")
+          = s_("AdminSettings|Require users to prove ownership of custom domains")
       .form-text.text-muted
-        = _("Domain verification is an essential security measure for public GitLab sites. Users are required to demonstrate they control a domain before it is enabled")
-        = link_to sprite_icon('question-o'), help_page_path('user/project/pages/custom_domains_ssl_tls_certification/index.md', anchor: '4-verify-the-domains-ownership')
+        - pages_link_url = help_page_path('administration/pages/index', anchor: 'custom-domain-verification')
+        - pages_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: pages_link_url }
+        = s_('AdminSettings|Domain verification is an essential security measure for public GitLab sites. Users are required to demonstrate they control a domain before it is enabled. %{link_start}Learn more.%{link_end}').html_safe % { link_start: pages_link_start, link_end: '</a>'.html_safe }
     - if Gitlab.config.pages.access_control
       .form-group
         .form-check
           = f.check_box :force_pages_access_control, class: 'form-check-input'
           = f.label :force_pages_access_control, class: 'form-check-label' do
-            = _("Disable public access to Pages sites")
+            = s_("AdminSettings|Disable public access to Pages sites")
         .form-text.text-muted
-          = _("Access to Pages websites are controlled based on the user's membership to a given project. By checking this box, users will be required to be logged in to have access to all Pages websites in your instance.")
-          = link_to sprite_icon('question-o'), help_page_path('administration/pages/index.md', anchor: 'disabling-public-access-to-all-pages-websites')
+          - pages_link_url = help_page_path('administration/pages/index', anchor: 'disable-public-access-to-all-pages-sites')
+          - pages_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: pages_link_url }
+          = s_("AdminSettings|Select to disable public access for Pages sites, which requires users to sign in for access to the Pages sites in your instance. %{link_start}Learn more.%{link_end}").html_safe % { link_start: pages_link_start, link_end: '</a>'.html_safe }
+    .form-group
+      = f.label :max_pages_size, _('Maximum size of pages (MB)'), class: 'label-bold'
+      = f.number_field :max_pages_size, class: 'form-control gl-form-input'
+      .form-text.text-muted
+        - pages_link_url = help_page_path('administration/pages/index', anchor: 'set-global-maximum-pages-size-per-project')
+        - pages_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: pages_link_url }
+        = s_('AdminSettings|Set the maximum size of GitLab Pages per project (0 for unlimited). %{link_start}Learn more.%{link_end}').html_safe % { link_start: pages_link_start, link_end: '</a>'.html_safe }
     %h5
-      = _("Configure Let's Encrypt")
+      = s_("AdminSettings|Configure Let's Encrypt")
     %p
       - lets_encrypt_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: "https://letsencrypt.org/" }
-      = _("%{lets_encrypt_link_start}Let's Encrypt%{lets_encrypt_link_end} is a free, automated, and open certificate authority (CA), that give digital certificates in order to enable HTTPS (SSL/TLS) for websites.").html_safe % { lets_encrypt_link_start: lets_encrypt_link_start, lets_encrypt_link_end: '</a>'.html_safe }
-    .form-group
-      = f.label :lets_encrypt_notification_email, _("Email"), class: 'label-bold'
-      = f.text_field :lets_encrypt_notification_email, class: 'form-control gl-form-input'
-      .form-text.text-muted
-        = _("A Let's Encrypt account will be configured for this GitLab installation using your email address. You will receive emails to warn of expiring certificates.")
-    .form-group
-      .form-check
-        = f.check_box :lets_encrypt_terms_of_service_accepted, class: 'form-check-input'
-        = f.label :lets_encrypt_terms_of_service_accepted, class: 'form-check-label' do
-          - terms_of_service_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: lets_encrypt_terms_of_service_admin_application_settings_path }
-          = _("I have read and agree to the Let's Encrypt %{link_start}Terms of Service%{link_end} (PDF)").html_safe % { link_start: terms_of_service_link_start, link_end: '</a>'.html_safe }
+      = _("%{lets_encrypt_link_start}Let's Encrypt%{lets_encrypt_link_end} is a free, automated, and open certificate authority (CA) that issues digital certificates to enable HTTPS (SSL/TLS) for sites.").html_safe % { lets_encrypt_link_start: lets_encrypt_link_start, lets_encrypt_link_end: '</a>'.html_safe }
+      .form-group
+        = f.label :lets_encrypt_notification_email, s_("AdminSettings|Let's Encrypt email"), class: 'label-bold'
+        = f.text_field :lets_encrypt_notification_email, class: 'form-control gl-form-input'
+        .form-text.text-muted
+          - pages_link_url = help_page_path('administration/pages/index', anchor: 'lets-encrypt-integration')
+          - pages_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: pages_link_url }
+          = s_("AdminSettings|A Let's Encrypt account will be configured for this GitLab instance using this email address. You will receive emails to warn of expiring certificates. %{link_start}Learn more.%{link_end}").html_safe % { link_start: pages_link_start, link_end: '</a>'.html_safe }
+      .form-group
+        .form-check
+          = f.check_box :lets_encrypt_terms_of_service_accepted, class: 'form-check-input'
+          = f.label :lets_encrypt_terms_of_service_accepted, class: 'form-check-label' do
+            - terms_of_service_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: lets_encrypt_terms_of_service_admin_application_settings_path }
+            = s_("AdminSettings|I have read and agree to the Let's Encrypt %{link_start}Terms of Service%{link_end} (PDF).").html_safe % { link_start: terms_of_service_link_start, link_end: '</a>'.html_safe }
 
   = f.submit _('Save changes'), class: "gl-button btn btn-confirm"

app/views/admin/application_settings/preferences.html.haml

@@ -43,7 +43,7 @@
     %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
       = expanded_by_default? ? _('Collapse') : _('Expand')
     %p
-      = _('Size and domain settings for static websites')
+      = s_('AdminSettings|Size and domain settings for Pages static sites.')
   .settings-content
     = render 'pages'
 

config/feature_flags/development/pages_limit_entries_count.yml

+---
+name: pages_limit_entries_count
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64925/diffs
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/334765
+milestone: '14.1'
+type: development
+group: group::release
+default_enabled: false

db/migrate/20210611082822_add_pages_file_entries_to_plan_limits.rb

+# frozen_string_literal: true
+
+class AddPagesFileEntriesToPlanLimits < ActiveRecord::Migration[6.1]
+  def change
+    add_column(:plan_limits, :pages_file_entries, :integer, default: 200_000, null: false)
+  end
+end

db/schema_migrations/20210611082822

+28b31b6e8aba1b8feec2b9a29b5f91f7145431be5d8b9875bddb8183f89700f7
\ No newline at end of file

db/structure.sql

@@ -16505,7 +16505,8 @@ CREATE TABLE plan_limits (
     ci_daily_pipeline_schedule_triggers integer DEFAULT 0 NOT NULL,
     ci_max_artifact_size_running_container_scanning integer DEFAULT 0 NOT NULL,
     ci_max_artifact_size_cluster_image_scanning integer DEFAULT 0 NOT NULL,
-    ci_jobs_trace_size_limit integer DEFAULT 100 NOT NULL
+    ci_jobs_trace_size_limit integer DEFAULT 100 NOT NULL,
+    pages_file_entries integer DEFAULT 200000 NOT NULL
 );
 
 CREATE SEQUENCE plan_limits_id_seq

doc/administration/instance_limits.md

@@ -457,6 +457,21 @@ installation, run the following in the [GitLab Rails console](operations/rails_c
 Plan.default.actual_limits.update!(ci_max_artifact_size_junit: 10)
 ```
 
+### Number of files per GitLab Pages web-site
+
+The total number of file entries (including directories and symlinks) is limited to `100000` per
+GitLab Pages website.
+
+This is the default limit for all [GitLab self-managed and SaaS plans](https://about.gitlab.com/pricing/).
+
+You can update the limit in your self-managed instance using the
+[GitLab Rails console](operations/rails_console.md#starting-a-rails-console-session).
+For example, to change the limit to `100`:
+
+```ruby
+Plan.default.actual_limits.update!(pages_file_entries: 100)
+```
+
 ### Number of registered runners per scope
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/321368) in GitLab 13.12.

doc/administration/pages/index.md

@@ -407,17 +407,15 @@ verification requirement:
 allows users to add Let's Encrypt SSL certificates for GitLab Pages
 sites served under a custom domain.
 
-To enable it, you must:
+To enable it:
 
 1. Choose an email address on which you want to receive notifications about expiring domains.
 1. On the top bar, select **Menu >** **{admin}** **Admin**.
 1. On the left sidebar, select **Settings > Preferences**.
 1. Expand **Pages**.
-1. Enter the email address for receiving notifications and accept Let's Encrypt's Terms of Service as shown below.
+1. Enter the email address for receiving notifications and accept Let's Encrypt's Terms of Service.
 1. Select **Save changes**.
 
-![Let's Encrypt settings](img/lets_encrypt_integration_v12_1.png)
-
 ### Access control
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/33422) in GitLab 11.5.
@@ -466,6 +464,7 @@ The scope to use for authentication must match the GitLab Pages OAuth applicatio
 pre-existing applications must modify the GitLab Pages OAuth application. Follow these steps to do
 this:
 
+1. Enable [access control](#access-control).
 1. On the top bar, select **Menu >** **{admin}** **Admin**.
 1. On the left sidebar, select **Settings > Applications**.
 1. Expand **GitLab Pages**.
@@ -473,7 +472,7 @@ this:
    `read_api`).
 1. Select **Save changes**.
 
-#### Disabling public access to all Pages websites
+#### Disable public access to all Pages sites
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/32095) in GitLab 12.7.
 
@@ -662,6 +661,16 @@ Follow the steps below to configure the proxy listener of GitLab Pages.
 
 1. [Reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure).
 
+## Set global maximum pages size per project **(FREE SELF)**
+
+To set the global maximum pages size for a project:
+
+1. On the top bar, select **Menu >** **{admin}** **Admin**.
+1. On the left sidebar, select **Settings > Preferences**.
+1. Expand **Pages**.
+1. Edit the **Maximum size of pages**.
+1. Select **Save changes**.
+
 ## Override maximum pages size per project or group **(PREMIUM SELF)**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/16610) in GitLab 12.7.

doc/user/project/releases/index.md

@@ -612,6 +612,18 @@ These metrics include:
 - Total number of releases in the group
 - Percentage of projects in the group that have at least one release
 
+## Working example project
+
+The Guided Exploration project [Utterly Automated Software and Artifact Versioning with GitVersion](https://gitlab.com/guided-explorations/devops-patterns/utterly-automated-versioning) demonstrates:
+
+- Using GitLab releases.
+- Using the GitLab `release-cli`.
+- Creating a generic package.
+- Linking the package to the release.
+- Using a tool called [GitVersion](https://gitversion.net/) to automatically determine and increment versions for complex repositories.
+
+You can copy the example project to your own group or instance for testing. More details on what other GitLab CI patterns are demonstrated are available at the project page.
+
 ## Troubleshooting
 
 ### Getting `403 Forbidden` or `Something went wrong while creating a new release` errors when creating, updating or deleting releases and their assets

locale/gitlab.pot

@@ -676,7 +676,7 @@ msgstr ""
 msgid "%{label_for_message} unavailable"
 msgstr ""
 
-msgid "%{lets_encrypt_link_start}Let's Encrypt%{lets_encrypt_link_end} is a free, automated, and open certificate authority (CA), that give digital certificates in order to enable HTTPS (SSL/TLS) for websites."
+msgid "%{lets_encrypt_link_start}Let's Encrypt%{lets_encrypt_link_end} is a free, automated, and open certificate authority (CA) that issues digital certificates to enable HTTPS (SSL/TLS) for sites."
 msgstr ""
 
 msgid "%{level_name} is not allowed in a %{group_level_name} group."
@@ -1191,9 +1191,6 @@ msgstr ""
 msgid "0 bytes"
 msgstr ""
 
-msgid "0 for unlimited"
-msgstr ""
-
 msgid "0 for unlimited, only effective with remote storage enabled."
 msgstr ""
 
@@ -1402,9 +1399,6 @@ msgstr ""
 msgid "A Let's Encrypt SSL certificate can not be obtained until your domain is verified."
 msgstr ""
 
-msgid "A Let's Encrypt account will be configured for this GitLab installation using your email address. You will receive emails to warn of expiring certificates."
-msgstr ""
-
 msgid "A Metrics Dashboard menu item appears in the Monitoring section of the Admin Area."
 msgstr ""
 
@@ -1726,9 +1720,6 @@ msgstr ""
 msgid "Access to '%{classification_label}' not allowed"
 msgstr ""
 
-msgid "Access to Pages websites are controlled based on the user's membership to a given project. By checking this box, users will be required to be logged in to have access to all Pages websites in your instance."
-msgstr ""
-
 msgid "AccessDropdown|Deploy Keys"
 msgstr ""
 
@@ -2365,27 +2356,45 @@ msgstr ""
 msgid "AdminProjects|Delete Project %{projectName}?"
 msgstr ""
 
+msgid "AdminSettings|A Let's Encrypt account will be configured for this GitLab instance using this email address. You will receive emails to warn of expiring certificates. %{link_start}Learn more.%{link_end}"
+msgstr ""
+
 msgid "AdminSettings|All new projects can use the instance's shared runners by default."
 msgstr ""
 
 msgid "AdminSettings|Auto DevOps domain"
 msgstr ""
 
+msgid "AdminSettings|Configure Let's Encrypt"
+msgstr ""
+
 msgid "AdminSettings|Disable feed token"
 msgstr ""
 
+msgid "AdminSettings|Disable public access to Pages sites"
+msgstr ""
+
+msgid "AdminSettings|Domain verification is an essential security measure for public GitLab sites. Users are required to demonstrate they control a domain before it is enabled. %{link_start}Learn more.%{link_end}"
+msgstr ""
+
 msgid "AdminSettings|Enable shared runners for new projects"
 msgstr ""
 
 msgid "AdminSettings|Feed token"
 msgstr ""
 
+msgid "AdminSettings|I have read and agree to the Let's Encrypt %{link_start}Terms of Service%{link_end} (PDF)."
+msgstr ""
+
 msgid "AdminSettings|If not specified at the group or instance level, the default is %{default_initial_branch_name}. Does not affect existing repositories."
 msgstr ""
 
 msgid "AdminSettings|Keep the latest artifacts for all jobs in the latest successful pipelines"
 msgstr ""
 
+msgid "AdminSettings|Let's Encrypt email"
+msgstr ""
+
 msgid "AdminSettings|Maximum duration of a session for Git operations when 2FA is enabled."
 msgstr ""
 
@@ -2398,6 +2407,9 @@ msgstr ""
 msgid "AdminSettings|Protect CI/CD variables by default"
 msgstr ""
 
+msgid "AdminSettings|Require users to prove ownership of custom domains"
+msgstr ""
+
 msgid "AdminSettings|Required pipeline configuration"
 msgstr ""
 
@@ -2407,12 +2419,21 @@ msgstr ""
 msgid "AdminSettings|Select a group to use as the source for instance-level project templates."
 msgstr ""
 
+msgid "AdminSettings|Select to disable public access for Pages sites, which requires users to sign in for access to the Pages sites in your instance. %{link_start}Learn more.%{link_end}"
+msgstr ""
+
 msgid "AdminSettings|Session duration for Git operations when 2FA is enabled (minutes)"
 msgstr ""
 
 msgid "AdminSettings|Set a CI/CD template as the required pipeline configuration for all projects in the instance. Project CI/CD configuration merges into the required pipeline configuration when the pipeline runs. %{link_start}What is a required pipeline configuration?%{link_end}"
 msgstr ""
 
+msgid "AdminSettings|Set the maximum size of GitLab Pages per project (0 for unlimited). %{link_start}Learn more.%{link_end}"
+msgstr ""
+
+msgid "AdminSettings|Size and domain settings for Pages static sites."
+msgstr ""
+
 msgid "AdminSettings|The default domain to use for Auto Review Apps and Auto Deploy stages in all projects."
 msgstr ""
 
@@ -8395,9 +8416,6 @@ msgstr ""
 msgid "Configure Integrations"
 msgstr ""
 
-msgid "Configure Let's Encrypt"
-msgstr ""
-
 msgid "Configure Prometheus"
 msgstr ""
 
@@ -11559,9 +11577,6 @@ msgstr ""
 msgid "Disable group runners"
 msgstr ""
 
-msgid "Disable public access to Pages sites"
-msgstr ""
-
 msgid "Disable two-factor authentication"
 msgstr ""
 
@@ -11732,9 +11747,6 @@ msgstr ""
 msgid "Domain cannot be deleted while associated to one or more clusters."
 msgstr ""
 
-msgid "Domain verification is an essential security measure for public GitLab sites. Users are required to demonstrate they control a domain before it is enabled"
-msgstr ""
-
 msgid "Domain was successfully created."
 msgstr ""
 
@@ -16455,9 +16467,6 @@ msgstr ""
 msgid "I forgot my password"
 msgstr ""
 
-msgid "I have read and agree to the Let's Encrypt %{link_start}Terms of Service%{link_end} (PDF)"
-msgstr ""
-
 msgid "I want to explore GitLab to see if it’s worth switching to"
 msgstr ""
 
@@ -28071,9 +28080,6 @@ msgstr ""
 msgid "Require user password for approvals."
 msgstr ""
 
-msgid "Require users to prove ownership of custom domains"
-msgstr ""
-
 msgid "Required approvals (%{approvals_given} given)"
 msgstr ""
 
@@ -30652,9 +30658,6 @@ msgstr ""
 msgid "Size"
 msgstr ""
 
-msgid "Size and domain settings for static websites"
-msgstr ""
-
 msgid "Size limit per repository (MB)"
 msgstr ""
 

scripts/frontend/startup_css/constants.js

@@ -49,7 +49,6 @@ const createMainOutput = ({ outFile, cssKeys, type }) => ({
   outFile,
   htmlPaths: [
     path.join(FIXTURES_ROOT, `startup_css/project-${type}.html`),
-    path.join(FIXTURES_ROOT, `startup_css/project-${type}-legacy-sidebar.html`),
     path.join(FIXTURES_ROOT, `startup_css/project-${type}-signed-out.html`),
   ],
   cssKeys,

spec/features/admin/admin_settings_spec.rb

@@ -634,7 +634,7 @@ RSpec.describe 'Admin updates settings' do
       it "change Pages Let's Encrypt settings" do
         visit preferences_admin_application_settings_path
         page.within('.as-pages') do
-          fill_in 'Email', with: 'my@test.example.com'
+          fill_in "Let's Encrypt email", with: 'my@test.example.com'
           check "I have read and agree to the Let's Encrypt Terms of Service"
           click_button 'Save changes'
         end

spec/frontend/fixtures/startup_css.rb

@@ -10,7 +10,6 @@ RSpec.describe 'Startup CSS fixtures', type: :controller do
   render_views
 
   before(:all) do
-    stub_feature_flags(sidebar_refactor: true)
     clean_frontend_fixtures('startup_css/')
   end
 
@@ -31,17 +30,6 @@ RSpec.describe 'Startup CSS fixtures', type: :controller do
       expect(response).to be_successful
     end
 
-    it "startup_css/project-#{type}-legacy-sidebar.html" do
-      stub_feature_flags(sidebar_refactor: false)
-
-      get :show, params: {
-        namespace_id: project.namespace.to_param,
-        id: project
-      }
-
-      expect(response).to be_successful
-    end
-
     it "startup_css/project-#{type}-signed-out.html" do
       sign_out(user)
 

spec/services/projects/update_pages_service_spec.rb

@@ -158,6 +158,21 @@ RSpec.describe Projects::UpdatePagesService do
         expect(execute).not_to eq(:success)
       end
 
+      it 'limits pages file count' do
+        create(:plan_limits, :default_plan, pages_file_entries: 2)
+
+        expect(execute).not_to eq(:success)
+
+        expect(GenericCommitStatus.last.description).to eq("pages site contains 3 file entries, while limit is set to 2")
+      end
+
+      it 'does not limit pages file count if feature is disabled' do
+        stub_feature_flags(pages_limit_entries_count: false)
+        create(:plan_limits, :default_plan, pages_file_entries: 2)
+
+        expect(execute).to eq(:success)
+      end
+
       it 'removes pages after destroy' do
         expect(PagesWorker).to receive(:perform_in)
         expect(project.pages_deployed?).to be_falsey
@@ -339,9 +354,15 @@ RSpec.describe Projects::UpdatePagesService do
       create(:ci_job_artifact, :archive, file: file, job: build)
       create(:ci_job_artifact, :metadata, file: metafile, job: build)
 
-      allow(build).to receive(:artifacts_metadata_entry)
+      allow(build).to receive(:artifacts_metadata_entry).with('public/', recursive: true)
                         .and_return(metadata)
       allow(metadata).to receive(:total_size).and_return(100)
+
+      # to pass entries count check
+      root_metadata = double('root metadata')
+      allow(build).to receive(:artifacts_metadata_entry).with('', recursive: true)
+                        .and_return(root_metadata)
+      allow(root_metadata).to receive_message_chain(:entries, :count).and_return(10)
     end
 
     it 'raises an error' do