From ed3b1698883bd4ac2c4faf6c05c3a8155748bf91 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 1 Oct 2019 18:06:28 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/assets/javascripts/jobs/components/job_app.vue | 2 +- app/assets/javascripts/jobs/components/job_log_json.vue | 10 ---------- app/controllers/application_controller.rb | 1 + app/services/projects/after_import_service.rb | 9 ++++++++- .../admin/application_settings/_protected_paths.html.haml | 2 +- 5 files changed, 11 insertions(+), 13 deletions(-) delete mode 100644 app/assets/javascripts/jobs/components/job_log_json.vue (limited to 'app') diff --git a/app/assets/javascripts/jobs/components/job_app.vue b/app/assets/javascripts/jobs/components/job_app.vue index 36701a95673..b4b124d5db1 100644 --- a/app/assets/javascripts/jobs/components/job_app.vue +++ b/app/assets/javascripts/jobs/components/job_app.vue @@ -30,7 +30,7 @@ export default { EnvironmentsBlock, ErasedBlock, Icon, - Log: () => (isNewJobLogActive() ? import('./job_log_json.vue') : import('./job_log.vue')), + Log: () => (isNewJobLogActive() ? import('./log/log.vue') : import('./job_log.vue')), LogTopBar, StuckBlock, UnmetPrerequisitesBlock, diff --git a/app/assets/javascripts/jobs/components/job_log_json.vue b/app/assets/javascripts/jobs/components/job_log_json.vue deleted file mode 100644 index 2198b20eb8f..00000000000 --- a/app/assets/javascripts/jobs/components/job_log_json.vue +++ /dev/null @@ -1,10 +0,0 @@ - - diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index ad242a078ad..01d80d77080 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -14,6 +14,7 @@ class ApplicationController < ActionController::Base include SessionlessAuthentication include ConfirmEmailWarning include Gitlab::Tracking::ControllerConcern + include Gitlab::Experimentation::ControllerConcern before_action :authenticate_user! before_action :enforce_terms!, if: :should_enforce_terms? diff --git a/app/services/projects/after_import_service.rb b/app/services/projects/after_import_service.rb index e30da0f26df..6fc15db9b4c 100644 --- a/app/services/projects/after_import_service.rb +++ b/app/services/projects/after_import_service.rb @@ -9,9 +9,16 @@ module Projects end def execute - Projects::HousekeepingService.new(@project).execute do + service = Projects::HousekeepingService.new(@project) + + service.execute do repository.delete_all_refs_except(RESERVED_REF_PREFIXES) end + + # Right now we don't actually have a way to know if a project + # import actually changed, so we increment the counter to avoid + # causing GC to run every time. + service.increment! rescue Projects::HousekeepingService::LeaseTaken => e Rails.logger.info( # rubocop:disable Gitlab/RailsLogger "Could not perform housekeeping for project #{@project.full_path} (#{@project.id}): #{e}") diff --git a/app/views/admin/application_settings/_protected_paths.html.haml b/app/views/admin/application_settings/_protected_paths.html.haml index cfb04562b59..f4d40e10f36 100644 --- a/app/views/admin/application_settings/_protected_paths.html.haml +++ b/app/views/admin/application_settings/_protected_paths.html.haml @@ -4,7 +4,7 @@ %fieldset - if omnibus_protected_paths_throttle? .bs-callout.bs-callout-danger - - relative_url_link = 'https://docs.gitlab.com/ee/user/admin_area/settings/protected_paths.html#migrating-from-omnibus' + - relative_url_link = 'https://docs.gitlab.com/ee/user/admin_area/settings/protected_paths.html#migrate-settings-from-gitlab-123-and-earlier' - relative_url_link_start = ''.html_safe % { url: relative_url_link } = _("Omnibus Protected Paths throttle is active. From 12.4, Omnibus throttle is deprecated and will be removed in a future release. Please read the %{relative_url_link_start}Migrating Protected Paths documentation%{relative_url_link_end}.").html_safe % { relative_url_link_start: relative_url_link_start, relative_url_link_end: ''.html_safe } -- cgit v1.2.3