Merge branch 'jej-pages-to-ce-ee' into 'master'

Minor updates to EE after porting pages to CE

See merge request !1156

app/controllers/admin/application_settings_controller.rb

@@ -118,6 +118,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
       :plantuml_url,
       :max_artifacts_size,
       :max_attachment_size,
+      :max_pages_size,
       :metrics_enabled,
       :metrics_host,
       :metrics_method_call_threshold,
@@ -158,7 +159,6 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
   def application_setting_params_ee
     [
       :help_text,
-      :max_pages_size,
       :elasticsearch_host,
       :elasticsearch_indexing,
       :elasticsearch_port,

app/policies/project_policy.rb

@@ -117,12 +117,12 @@ class ProjectPolicy < BasePolicy
     can! :admin_pipeline
     can! :admin_environment
     can! :admin_deployment
-
-    # EE-only
-    can! :admin_path_locks
     can! :admin_pages
     can! :read_pages
     can! :update_pages
+
+    # EE-only
+    can! :admin_path_locks
   end
 
   def public_access!
@@ -149,8 +149,6 @@ class ProjectPolicy < BasePolicy
     can! :remove_fork_project
     can! :destroy_merge_request
     can! :destroy_issue
-
-    # EE-only
     can! :remove_pages
   end
 

config/routes/project.rb

@@ -39,11 +39,9 @@ constraints(ProjectUrlConstrainer.new) do
         end
       end
 
-      ## EE-specific
       resource :pages, only: [:show, :destroy] do
         resources :domains, only: [:show, :new, :create, :destroy], controller: 'pages_domains', constraints: { id: /[^\/]+/ }
       end
-      ## EE-specific
 
       resources :compare, only: [:index, :create] do
         collection do

config/sidekiq_queues.yml

@@ -50,8 +50,8 @@
   - [reactive_caching, 1]
   - [cronjob, 1]
   - [default, 1]
-  # EE specific queues
   - [pages, 1]
+  # EE specific queues
   - [elasticsearch, 1]
   - [geo, 1]
   - [project_mirror, 1]

doc/user/project/pages/index.md

@@ -3,6 +3,7 @@
 > **Notes:**
 > - This feature was [introduced][ee-80] in GitLab EE 8.3.
 > - Custom CNAMEs with TLS support were [introduced][ee-173] in GitLab EE 8.5.
+> - GitLab Pages [were ported][ce-14605] to Community Edition in GitLab 8.17.
 > - This document is about the user guide. To learn how to enable GitLab Pages
 >   across your GitLab instance, visit the [administrator documentation](../../../administration/pages/index.md).
 

lib/api/settings.rb

@@ -57,6 +57,7 @@ module API
         requires :shared_runners_text, type: String, desc: 'Shared runners text '
       end
       optional :max_artifacts_size, type: Integer, desc: "Set the maximum file size each build's artifacts can have"
+      optional :max_pages_size, type: Integer, desc: 'Maximum size of pages in MB'
       optional :container_registry_token_expire_delay, type: Integer, desc: 'Authorization token duration (minutes)'
       optional :metrics_enabled, type: Boolean, desc: 'Enable the InfluxDB metrics'
       given metrics_enabled: ->(val) { val } do
@@ -109,7 +110,6 @@ module API
       end
       # GitLab-EE specific settings
       optional :help_text, type: String, desc: 'GitLab server administrator information'
-      optional :max_pages_size, type: Integer, desc: 'Maximum size of pages in MB'
       optional :elasticsearch_indexing, type: Boolean, desc: 'Enable Elasticsearch indexing'
       given elasticsearch_indexing: ->(val) { val } do
         optional :elasticsearch_search, type: Boolean, desc: 'Enable Elasticsearch search'
@@ -129,13 +129,13 @@ module API
                       :send_user_confirmation_email, :domain_whitelist, :domain_blacklist_enabled,
                       :after_sign_up_text, :signin_enabled, :require_two_factor_authentication,
                       :home_page_url, :after_sign_out_path, :sign_in_text, :help_page_text,
-                      :shared_runners_enabled, :max_artifacts_size, :container_registry_token_expire_delay,
+                      :shared_runners_enabled, :max_artifacts_size, :max_pages_size, :container_registry_token_expire_delay,
                       :metrics_enabled, :sidekiq_throttling_enabled, :recaptcha_enabled,
                       :akismet_enabled, :admin_notification_email, :sentry_enabled,
                       :repository_checks_enabled, :koding_enabled, :housekeeping_enabled, :plantuml_enabled,
                       :version_check_enabled, :email_author_in_body, :html_emails_enabled,
                       # GitLab-EE specific settings
-                      :help_text, :max_pages_size, :elasticsearch_indexing, :usage_ping_enabled,
+                      :help_text, :elasticsearch_indexing, :usage_ping_enabled,
                       :repository_storage, :repository_storages, :repository_size_limit
     end
     put "application/settings" do