Add latest changes from gitlab-org/gitlab@master

4 files changed, 10 insertions, 12 deletions

diff --git a/app/assets/javascripts/persistent_user_callouts.js b/app/assets/javascripts/persistent_user_callouts.js
index 31e80107fd8..100ffc0664b 100644
--- a/app/assets/javascripts/persistent_user_callouts.js
+++ b/app/assets/javascripts/persistent_user_callouts.js
@@ -10,7 +10,7 @@ const PERSISTENT_USER_CALLOUTS = [
   '.js-new-user-signups-cap-reached',
   '.js-eoa-bronze-plan-banner',
   '.js-security-newsletter-callout',
-  '.js-approaching-seat-count-threshold',
+  '.js-approaching-seats-count-threshold',
   '.js-storage-enforcement-banner',
   '.js-user-over-limit-free-plan-alert',
   '.js-minute-limit-banner',
diff --git a/app/controllers/registrations/welcome_controller.rb b/app/controllers/registrations/welcome_controller.rb
index 77e734e15fa..ea50099120b 100644
--- a/app/controllers/registrations/welcome_controller.rb
+++ b/app/controllers/registrations/welcome_controller.rb
@@ -58,16 +58,7 @@ module Registrations
     def path_for_signed_in_user(user)
       return users_almost_there_path(email: user.email) if requires_confirmation?(user)
 
-      stored_url = stored_location_for(user)
-      if ::Feature.enabled?(:about_your_company_registration_flow) &&
-          stored_url&.include?(new_users_sign_up_company_path)
-        company_params = update_params.slice(:role, :other_role, :registration_objective)
-                          .merge(params.permit(:jobs_to_be_done_other))
-        redirect_uri = Gitlab::Utils.add_url_parameters(stored_url, company_params)
-        store_location_for(:user, redirect_uri)
-      else
-        stored_url || members_activity_path(user.members)
-      end
+      stored_location_for(user) || members_activity_path(user.members)
     end
 
     def members_activity_path(members)
diff --git a/app/graphql/types/issue_type.rb b/app/graphql/types/issue_type.rb
index c83200bd614..58729b34fc7 100644
--- a/app/graphql/types/issue_type.rb
+++ b/app/graphql/types/issue_type.rb
@@ -127,6 +127,9 @@ module Types
     field :moved_to, Types::IssueType, null: true,
           description: 'Updated Issue after it got moved to another project.'
 
+    field :closed_as_duplicate_of, Types::IssueType, null: true,
+          description: 'Issue this issue was closed as a duplicate of.'
+
     field :create_note_email, GraphQL::Types::String, null: true,
           description: 'User specific email address for the issue.'
 
@@ -161,6 +164,10 @@ module Types
       Gitlab::Graphql::Loaders::BatchModelLoader.new(Issue, object.moved_to_id).find
     end
 
+    def closed_as_duplicate_of
+      Gitlab::Graphql::Loaders::BatchModelLoader.new(Issue, object.duplicated_to_id).find
+    end
+
     def discussion_locked
       !!object.discussion_locked
     end
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index b7cf7b7468f..185ed228d92 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -16,7 +16,7 @@
       = yield :flash_message
       = dispensable_render "shared/service_ping_consent"
       = dispensable_render_if_exists "layouts/header/ee_subscribable_banner"
-      = dispensable_render_if_exists "layouts/header/seat_count_alert"
+      = dispensable_render_if_exists "layouts/header/seats_count_alert"
       = dispensable_render_if_exists "shared/namespace_storage_limit_alert"
       = dispensable_render_if_exists "shared/namespace_user_cap_reached_alert"
       = dispensable_render_if_exists "shared/new_user_signups_cap_reached_alert"