Add latest changes from gitlab-org/gitlab@master

3 files changed, 2 insertions, 33 deletions

diff --git a/lib/api/api.rb b/lib/api/api.rb
index 51fc006ec08..cf6e7f18a5f 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -105,7 +105,7 @@ module API
 
     namespace do
       after do
-        ::Users::ActivityService.new(@current_user).execute if Feature.enabled?(:api_activity_logging)
+        ::Users::ActivityService.new(@current_user).execute
       end
 
       # Keep in alphabetical order
diff --git a/lib/gitlab/background_migration/link_lfs_objects.rb b/lib/gitlab/background_migration/link_lfs_objects.rb
deleted file mode 100644
index 69c03f617bf..00000000000
--- a/lib/gitlab/background_migration/link_lfs_objects.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module BackgroundMigration
-    # Create missing LfsObjectsProject records for forks
-    class LinkLfsObjects
-      # Model definition used for migration
-      class ForkNetworkMember < ActiveRecord::Base
-        self.table_name = 'fork_network_members'
-
-        def self.with_non_existing_lfs_objects
-          joins('JOIN lfs_objects_projects lop ON fork_network_members.forked_from_project_id = lop.project_id')
-            .where(
-              <<~SQL
-                NOT EXISTS (
-                  SELECT 1
-                  FROM lfs_objects_projects
-                  WHERE lfs_objects_projects.project_id = fork_network_members.project_id
-                  AND lfs_objects_projects.lfs_object_id = lop.lfs_object_id
-                )
-              SQL
-            )
-        end
-      end
-
-      def perform(start_id, end_id)
-        # no-op as some queries times out
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/experimentation.rb b/lib/gitlab/experimentation.rb
index b8c630d1b12..68f3c9e332e 100644
--- a/lib/gitlab/experimentation.rb
+++ b/lib/gitlab/experimentation.rb
@@ -20,7 +20,7 @@ module Gitlab
       paid_signup_flow: {
         feature_toggle: :paid_signup_flow,
         environment: ::Gitlab.dev_env_or_com?,
-        enabled_ratio: 0.5,
+        enabled_ratio: 1,
         tracking_category: 'Growth::Acquisition::Experiment::PaidSignUpFlow'
       },
       suggest_pipeline: {