From 93f8e7f3aa02e4fb092fc3664c50e8382ddb34f0 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 17 Jan 2023 06:08:39 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .rubocop_todo/layout/line_length.yml | 2 -- .rubocop_todo/rspec/context_wording.yml | 2 -- .rubocop_todo/rspec/expect_in_hook.yml | 1 - .rubocop_todo/style/percent_literal_delimiters.yml | 1 - .../javascripts/graphql_shared/possible_types.json | 3 ++- app/assets/javascripts/lib/utils/http_status.js | 8 -------- app/controllers/registrations_controller.rb | 8 ++++++-- doc/api/graphql/reference/index.md | 13 +++++++++++++ spec/support/rspec_order_todo.yml | 3 --- 9 files changed, 21 insertions(+), 20 deletions(-) diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml index 23143e147f1..b55a274d06b 100644 --- a/.rubocop_todo/layout/line_length.yml +++ b/.rubocop_todo/layout/line_length.yml @@ -1905,7 +1905,6 @@ Layout/LineLength: - 'ee/spec/helpers/ee/subscribable_banner_helper_spec.rb' - 'ee/spec/helpers/ee/users/callouts_helper_spec.rb' - 'ee/spec/helpers/ee/version_check_helper_spec.rb' - - 'ee/spec/helpers/ee/welcome_helper_spec.rb' - 'ee/spec/helpers/epics_helper_spec.rb' - 'ee/spec/helpers/gitlab_subscriptions/upcoming_reconciliation_helper_spec.rb' - 'ee/spec/helpers/groups/security_features_helper_spec.rb' @@ -2722,7 +2721,6 @@ Layout/LineLength: - 'ee/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb' - 'ee/spec/views/operations/environments.html.haml_spec.rb' - 'ee/spec/views/projects/security/discover/show.html.haml_spec.rb' - - 'ee/spec/views/registrations/welcome/show.html.haml_spec.rb' - 'ee/spec/views/shared/_mirror_status.html.haml_spec.rb' - 'ee/spec/views/shared/_namespace_user_cap_reached_alert.html.haml_spec.rb' - 'ee/spec/views/shared/billings/_eoa_bronze_plan_banner.html.haml_spec.rb' diff --git a/.rubocop_todo/rspec/context_wording.yml b/.rubocop_todo/rspec/context_wording.yml index c1bd63de2f1..ccadc31c974 100644 --- a/.rubocop_todo/rspec/context_wording.yml +++ b/.rubocop_todo/rspec/context_wording.yml @@ -281,7 +281,6 @@ RSpec/ContextWording: - 'ee/spec/helpers/ee/operations_helper_spec.rb' - 'ee/spec/helpers/ee/personal_access_tokens_helper_spec.rb' - 'ee/spec/helpers/ee/projects/security/api_fuzzing_configuration_helper_spec.rb' - - 'ee/spec/helpers/ee/welcome_helper_spec.rb' - 'ee/spec/helpers/groups/security_features_helper_spec.rb' - 'ee/spec/helpers/license_helper_spec.rb' - 'ee/spec/helpers/license_monitoring_helper_spec.rb' @@ -919,7 +918,6 @@ RSpec/ContextWording: - 'ee/spec/views/layouts/nav/sidebar/_push_rules_link.html.haml_spec.rb' - 'ee/spec/views/profiles/preferences/show.html.haml_spec.rb' - 'ee/spec/views/projects/security/discover/show.html.haml_spec.rb' - - 'ee/spec/views/registrations/welcome/show.html.haml_spec.rb' - 'ee/spec/views/search/_category.html.haml_spec.rb' - 'ee/spec/views/shared/_clone_panel.html.haml_spec.rb' - 'ee/spec/views/shared/_kerberos_clone_button.html.haml_spec.rb' diff --git a/.rubocop_todo/rspec/expect_in_hook.yml b/.rubocop_todo/rspec/expect_in_hook.yml index 4b49adf63f9..7fc5bdbdb6d 100644 --- a/.rubocop_todo/rspec/expect_in_hook.yml +++ b/.rubocop_todo/rspec/expect_in_hook.yml @@ -25,7 +25,6 @@ RSpec/ExpectInHook: - 'ee/spec/helpers/ee/integrations_helper_spec.rb' - 'ee/spec/helpers/ee/issues_helper_spec.rb' - 'ee/spec/helpers/ee/projects/security/dast_configuration_helper_spec.rb' - - 'ee/spec/helpers/ee/welcome_helper_spec.rb' - 'ee/spec/helpers/kerberos_helper_spec.rb' - 'ee/spec/helpers/vulnerabilities_helper_spec.rb' - 'ee/spec/lib/ee/api/helpers/members_helpers_spec.rb' diff --git a/.rubocop_todo/style/percent_literal_delimiters.yml b/.rubocop_todo/style/percent_literal_delimiters.yml index 54945e69974..b2c466353df 100644 --- a/.rubocop_todo/style/percent_literal_delimiters.yml +++ b/.rubocop_todo/style/percent_literal_delimiters.yml @@ -304,7 +304,6 @@ Style/PercentLiteralDelimiters: - 'ee/spec/helpers/ee/geo_helper_spec.rb' - 'ee/spec/helpers/ee/labels_helper_spec.rb' - 'ee/spec/helpers/ee/security_orchestration_helper_spec.rb' - - 'ee/spec/helpers/ee/welcome_helper_spec.rb' - 'ee/spec/helpers/merge_requests_helper_spec.rb' - 'ee/spec/helpers/subscriptions_helper_spec.rb' - 'ee/spec/helpers/vulnerabilities_helper_spec.rb' diff --git a/app/assets/javascripts/graphql_shared/possible_types.json b/app/assets/javascripts/graphql_shared/possible_types.json index 5467105ac3c..a622b342c0a 100644 --- a/app/assets/javascripts/graphql_shared/possible_types.json +++ b/app/assets/javascripts/graphql_shared/possible_types.json @@ -153,8 +153,9 @@ "WorkItemWidgetMilestone", "WorkItemWidgetNotes", "WorkItemWidgetProgress", + "WorkItemWidgetRequirementLegacy", "WorkItemWidgetStartAndDueDate", "WorkItemWidgetStatus", "WorkItemWidgetWeight" ] -} \ No newline at end of file +} diff --git a/app/assets/javascripts/lib/utils/http_status.js b/app/assets/javascripts/lib/utils/http_status.js index 9ca4efe6dfe..678ebc35565 100644 --- a/app/assets/javascripts/lib/utils/http_status.js +++ b/app/assets/javascripts/lib/utils/http_status.js @@ -22,12 +22,6 @@ export const HTTP_STATUS_NOT_FOUND = 404; export const HTTP_STATUS_INTERNAL_SERVER_ERROR = 500; export const HTTP_STATUS_SERVICE_UNAVAILABLE = 503; -// TODO move the rest of the status codes to primitive constants -// https://docs.gitlab.com/ee/development/fe_guide/style/javascript.html#export-constants-as-primitives -const httpStatusCodes = { - OK: 200, -}; - export const successCodes = [ HTTP_STATUS_OK, HTTP_STATUS_CREATED, @@ -40,5 +34,3 @@ export const successCodes = [ HTTP_STATUS_ALREADY_REPORTED, HTTP_STATUS_IM_USED, ]; - -export default httpStatusCodes; diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index 20f83c7dacc..0800d635d92 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -121,7 +121,7 @@ class RegistrationsController < Devise::RegistrationsController def after_sign_up_path_for(user) Gitlab::AppLogger.info(user_created_message(confirmed: user.confirmed?)) - users_sign_up_welcome_path(glm_tracking_params) + after_sign_up_path end def after_inactive_sign_up_path_for(resource) @@ -131,7 +131,7 @@ class RegistrationsController < Devise::RegistrationsController # when email confirmation is enabled, path to redirect is saved # after user confirms and comes back, he will be redirected - store_location_for(:redirect, users_sign_up_welcome_path(glm_tracking_params)) + store_location_for(:redirect, after_sign_up_path) return identity_verification_redirect_path if custom_confirmation_enabled? @@ -141,6 +141,10 @@ class RegistrationsController < Devise::RegistrationsController private + def after_sign_up_path + users_sign_up_welcome_path(glm_tracking_params) + end + def ensure_destroy_prerequisites_met if current_user.solo_owned_groups.present? redirect_to profile_account_path, diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md index 894a40fa23a..ef6ad4000d4 100644 --- a/doc/api/graphql/reference/index.md +++ b/doc/api/graphql/reference/index.md @@ -21163,6 +21163,17 @@ Represents a progress widget. | `progress` | [`Int`](#int) | Progress of the work item. | | `type` | [`WorkItemWidgetType`](#workitemwidgettype) | Widget type. | +### `WorkItemWidgetRequirementLegacy` + +Represents a legacy requirement widget. + +#### Fields + +| Name | Type | Description | +| ---- | ---- | ----------- | +| `legacyIid` **{warning-solid}** | [`Int`](#int) | **Deprecated** in 15.9. Use Work Item IID instead. | +| `type` | [`WorkItemWidgetType`](#workitemwidgettype) | Widget type. | + ### `WorkItemWidgetStartAndDueDate` Represents a start and due date widget. @@ -23373,6 +23384,7 @@ Type of a work item widget. | `MILESTONE` | Milestone widget. | | `NOTES` | Notes widget. | | `PROGRESS` | Progress widget. | +| `REQUIREMENT_LEGACY` | Requirement Legacy widget. | | `START_AND_DUE_DATE` | Start And Due Date widget. | | `STATUS` | Status widget. | | `WEIGHT` | Weight widget. | @@ -24698,6 +24710,7 @@ Implementations: - [`WorkItemWidgetMilestone`](#workitemwidgetmilestone) - [`WorkItemWidgetNotes`](#workitemwidgetnotes) - [`WorkItemWidgetProgress`](#workitemwidgetprogress) +- [`WorkItemWidgetRequirementLegacy`](#workitemwidgetrequirementlegacy) - [`WorkItemWidgetStartAndDueDate`](#workitemwidgetstartandduedate) - [`WorkItemWidgetStatus`](#workitemwidgetstatus) - [`WorkItemWidgetWeight`](#workitemwidgetweight) diff --git a/spec/support/rspec_order_todo.yml b/spec/support/rspec_order_todo.yml index e14db02d9c2..919ce9028db 100644 --- a/spec/support/rspec_order_todo.yml +++ b/spec/support/rspec_order_todo.yml @@ -993,7 +993,6 @@ - './ee/spec/helpers/ee/trial_registration_helper_spec.rb' - './ee/spec/helpers/ee/users/callouts_helper_spec.rb' - './ee/spec/helpers/ee/version_check_helper_spec.rb' -- './ee/spec/helpers/ee/welcome_helper_spec.rb' - './ee/spec/helpers/ee/wiki_helper_spec.rb' - './ee/spec/helpers/epics_helper_spec.rb' - './ee/spec/helpers/gitlab_subscriptions/upcoming_reconciliation_helper_spec.rb' @@ -3156,7 +3155,6 @@ - './ee/spec/views/projects/settings/subscriptions/_index.html.haml_spec.rb' - './ee/spec/views/registrations/groups_projects/new.html.haml_spec.rb' - './ee/spec/views/registrations/welcome/continuous_onboarding_getting_started.html.haml_spec.rb' -- './ee/spec/views/registrations/welcome/show.html.haml_spec.rb' - './ee/spec/views/search/_category.html.haml_spec.rb' - './ee/spec/views/shared/billings/_billing_plan_actions.html.haml_spec.rb' - './ee/spec/views/shared/billings/_billing_plan.html.haml_spec.rb' @@ -3184,7 +3182,6 @@ - './ee/spec/views/subscriptions/buy_storage.html.haml_spec.rb' - './ee/spec/views/subscriptions/groups/edit.html.haml_spec.rb' - './ee/spec/views/subscriptions/new.html.haml_spec.rb' -- './ee/spec/views/trial_registrations/new.html.haml_spec.rb' - './ee/spec/workers/active_user_count_threshold_worker_spec.rb' - './ee/spec/workers/adjourned_group_deletion_worker_spec.rb' - './ee/spec/workers/adjourned_project_deletion_worker_spec.rb'