Add latest changes from gitlab-org/gitlab@master

9 files changed, 53 insertions, 4 deletions

diff --git a/GITLAB_KAS_VERSION b/GITLAB_KAS_VERSION
index 566299ecad4..c681ac9129e 100644
--- a/GITLAB_KAS_VERSION
+++ b/GITLAB_KAS_VERSION
@@ -1 +1 @@
-15.9.0-rc1
+v15.9.0-rc2
diff --git a/app/models/timelog.rb b/app/models/timelog.rb
index 07c61f64f29..dc976816ad9 100644
--- a/app/models/timelog.rb
+++ b/app/models/timelog.rb
@@ -2,6 +2,9 @@
 
 class Timelog < ApplicationRecord
   include Importable
+  include IgnorableColumns
+
+  ignore_column :note_id_convert_to_bigint, remove_with: '16.0', remove_after: '2023-05-22'
 
   before_save :set_project
 
diff --git a/db/migrate/20230207030244_initialize_conversion_of_timelogs_note_id_to_bigint.rb b/db/migrate/20230207030244_initialize_conversion_of_timelogs_note_id_to_bigint.rb
new file mode 100644
index 00000000000..85e218f8e64
--- /dev/null
+++ b/db/migrate/20230207030244_initialize_conversion_of_timelogs_note_id_to_bigint.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class InitializeConversionOfTimelogsNoteIdToBigint < Gitlab::Database::Migration[2.1]
+  TABLE = :timelogs
+  COLUMNS = %i[note_id]
+
+  enable_lock_retries!
+
+  def up
+    initialize_conversion_of_integer_to_bigint(TABLE, COLUMNS)
+  end
+
+  def down
+    revert_initialize_conversion_of_integer_to_bigint(TABLE, COLUMNS)
+  end
+end
diff --git a/db/post_migrate/20230207030259_backfill_timelogs_note_id_for_bigint_conversion.rb b/db/post_migrate/20230207030259_backfill_timelogs_note_id_for_bigint_conversion.rb
new file mode 100644
index 00000000000..e88b810d813
--- /dev/null
+++ b/db/post_migrate/20230207030259_backfill_timelogs_note_id_for_bigint_conversion.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class BackfillTimelogsNoteIdForBigintConversion < Gitlab::Database::Migration[2.1]
+  TABLE = :timelogs
+  COLUMNS = %i[note_id]
+
+  restrict_gitlab_migration gitlab_schema: :gitlab_main
+
+  def up
+    backfill_conversion_of_integer_to_bigint(TABLE, COLUMNS)
+  end
+
+  def down
+    revert_backfill_conversion_of_integer_to_bigint(TABLE, COLUMNS)
+  end
+end
diff --git a/db/schema_migrations/20230207030244 b/db/schema_migrations/20230207030244
new file mode 100644
index 00000000000..bece0b240db
--- /dev/null
+++ b/db/schema_migrations/20230207030244
@@ -0,0 +1 @@
+30d4ae8a173564126a93ccd7c82d3f43c6567b2c279f7a9949baa50cff372b0c
\ No newline at end of file
diff --git a/db/schema_migrations/20230207030259 b/db/schema_migrations/20230207030259
new file mode 100644
index 00000000000..30c5d56506d
--- /dev/null
+++ b/db/schema_migrations/20230207030259
@@ -0,0 +1 @@
+250261f4bbe1da4067a0a9c634114c893c7f43c968dc22fc684a1ea6f85926a8
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index de5030325f9..10c76e979bb 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -268,6 +268,15 @@ BEGIN
   NEW."diff_note_id_convert_to_bigint" := NEW."diff_note_id";
   RETURN NEW;
 END;
+$$;  
+
+CREATE FUNCTION trigger_428d92773fe7() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+BEGIN
+  NEW."note_id_convert_to_bigint" := NEW."note_id";
+  RETURN NEW;
+END;
 $$;
 
 CREATE FUNCTION trigger_7f4fcd5aa322() RETURNS trigger
@@ -22525,6 +22534,7 @@ CREATE TABLE timelogs (
     note_id integer,
     project_id integer,
     summary text,
+    note_id_convert_to_bigint bigint,
     CONSTRAINT check_271d321699 CHECK ((char_length(summary) <= 255))
 );
 
@@ -33585,6 +33595,8 @@ CREATE TRIGGER trigger_3dc62927cae8 BEFORE INSERT OR UPDATE ON design_user_menti
 
 CREATE TRIGGER trigger_775287b6d67a BEFORE INSERT OR UPDATE ON note_diff_files FOR EACH ROW EXECUTE FUNCTION trigger_775287b6d67a();
 
+CREATE TRIGGER trigger_428d92773fe7 BEFORE INSERT OR UPDATE ON timelogs FOR EACH ROW EXECUTE FUNCTION trigger_428d92773fe7();
+
 CREATE TRIGGER trigger_7f4fcd5aa322 BEFORE INSERT OR UPDATE ON sent_notifications FOR EACH ROW EXECUTE FUNCTION trigger_7f4fcd5aa322();
 
 CREATE TRIGGER trigger_bfc6e47be8cc BEFORE INSERT OR UPDATE ON snippet_user_mentions FOR EACH ROW EXECUTE FUNCTION trigger_bfc6e47be8cc();
diff --git a/workhorse/go.mod b/workhorse/go.mod
index 37563e7ef4c..25369798400 100644
--- a/workhorse/go.mod
+++ b/workhorse/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/BurntSushi/toml v1.2.1
 	github.com/FZambia/sentinel v1.1.1
 	github.com/alecthomas/chroma/v2 v2.4.0
-	github.com/aws/aws-sdk-go v1.44.194
+	github.com/aws/aws-sdk-go v1.44.199
 	github.com/disintegration/imaging v1.6.2
 	github.com/getsentry/raven-go v0.2.0
 	github.com/golang-jwt/jwt/v4 v4.4.3
diff --git a/workhorse/go.sum b/workhorse/go.sum
index 8c0db7dd590..838e40a4cc3 100644
--- a/workhorse/go.sum
+++ b/workhorse/go.sum
@@ -544,8 +544,8 @@ github.com/aws/aws-sdk-go v1.43.11/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4
 github.com/aws/aws-sdk-go v1.43.31/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
 github.com/aws/aws-sdk-go v1.44.128/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
 github.com/aws/aws-sdk-go v1.44.151/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
-github.com/aws/aws-sdk-go v1.44.194 h1:1ZDK+QDcc5oRbZGgRZSz561eR8XVizXCeGpoZKo33NU=
-github.com/aws/aws-sdk-go v1.44.194/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
+github.com/aws/aws-sdk-go v1.44.199 h1:hYuQmS4zLMJR9v2iOp2UOD6Vi/0V+nwyR/Uhrkrtlbc=
+github.com/aws/aws-sdk-go v1.44.199/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
 github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
 github.com/aws/aws-sdk-go-v2 v1.17.1 h1:02c72fDJr87N8RAC2s3Qu0YuvMRZKNZJ9F+lAehCazk=
 github.com/aws/aws-sdk-go-v2 v1.17.1/go.mod h1:JLnGeGONAyi2lWXI1p0PCIOIy333JMVK1U7Hf0aRFLw=