Add latest changes from gitlab-org/gitlab@master

3 files changed, 47 insertions, 6 deletions

diff --git a/lib/gitlab/ci/variables/collection.rb b/lib/gitlab/ci/variables/collection.rb
index 52673d03e69..b6d6e1a3e5f 100644
--- a/lib/gitlab/ci/variables/collection.rb
+++ b/lib/gitlab/ci/variables/collection.rb
@@ -72,7 +72,7 @@ module Gitlab
           Collection.new(@variables.reject(&block))
         end
 
-        def expand_value(value, keep_undefined: false, expand_file_vars: true)
+        def expand_value(value, keep_undefined: false, expand_file_vars: true, project: nil)
           value.gsub(Item::VARIABLES_REGEXP) do
             match = Regexp.last_match # it is either a valid variable definition or a ($$ / %%)
             full_match = match[0]
@@ -88,6 +88,16 @@ module Gitlab
             if variable # VARIABLE_NAME is an existing variable
               next variable.value unless variable.file?
 
+              # Will be cleaned up with https://gitlab.com/gitlab-org/gitlab/-/issues/378266
+              if project
+                # We only log if `project` exists to make sure it is called from `Ci::BuildRunnerPresenter`
+                # when the variables are sent to Runner.
+                Gitlab::AppJsonLogger.info(
+                  event: 'file_variable_is_referenced_in_another_variable',
+                  project_id: project.id
+                )
+              end
+
               expand_file_vars ? variable.value : full_match
             elsif keep_undefined
               full_match # we do not touch the variable definition
@@ -97,7 +107,7 @@ module Gitlab
           end
         end
 
-        def sort_and_expand_all(keep_undefined: false, expand_file_vars: true)
+        def sort_and_expand_all(keep_undefined: false, expand_file_vars: true, project: nil)
           sorted = Sort.new(self)
           return self.class.new(self, sorted.errors) unless sorted.valid?
 
@@ -112,7 +122,8 @@ module Gitlab
             # expand variables as they are added
             variable = item.to_runner_variable
             variable[:value] = new_collection.expand_value(variable[:value], keep_undefined: keep_undefined,
-                                                                             expand_file_vars: expand_file_vars)
+                                                                             expand_file_vars: expand_file_vars,
+                                                                             project: project)
             new_collection.append(variable)
           end
 
diff --git a/lib/gitlab/database/partitioning/convert_table_to_first_list_partition.rb b/lib/gitlab/database/partitioning/convert_table_to_first_list_partition.rb
index 4c8c7f26fe2..23a8dc0b44f 100644
--- a/lib/gitlab/database/partitioning/convert_table_to_first_list_partition.rb
+++ b/lib/gitlab/database/partitioning/convert_table_to_first_list_partition.rb
@@ -173,9 +173,21 @@ module Gitlab
         def alter_sequence_statements(old_table:, new_table:)
           sequences_owned_by(old_table).map do |seq_info|
             seq_name, column_name = seq_info.values_at(:name, :column_name)
-            <<~SQL.chomp
+
+            statement_parts = []
+
+            # If a different user owns the old table, the conversion process will fail to reassign the sequence
+            # ownership to the new parent table (as it will be owned by the current user).
+            # Force the old table to be owned by the current user in that case.
+            unless current_user_owns_table?(old_table)
+              statement_parts << set_current_user_owns_table_statement(old_table)
+            end
+
+            statement_parts << <<~SQL.chomp
               ALTER SEQUENCE #{quote_table_name(seq_name)} OWNED BY #{quote_table_name(new_table)}.#{quote_column_name(column_name)}
             SQL
+
+            statement_parts.join(SQL_STATEMENT_SEPARATOR)
           end
         end
 
@@ -206,6 +218,23 @@ module Gitlab
             { name: name, column_name: column_name }
           end
         end
+
+        def table_owner(table_name)
+          connection.select_value(<<~SQL, nil, [table_name])
+            SELECT tableowner FROM pg_tables WHERE tablename = $1
+          SQL
+        end
+
+        def current_user_owns_table?(table_name)
+          current_user = connection.select_value('select current_user')
+          table_owner(table_name) == current_user
+        end
+
+        def set_current_user_owns_table_statement(table_name)
+          <<~SQL.chomp
+            ALTER TABLE #{connection.quote_table_name(table_name)} OWNER TO CURRENT_USER
+          SQL
+        end
       end
     end
   end
diff --git a/lib/gitlab/import_export/uploads_manager.rb b/lib/gitlab/import_export/uploads_manager.rb
index ad19508fb99..bc0563729a7 100644
--- a/lib/gitlab/import_export/uploads_manager.rb
+++ b/lib/gitlab/import_export/uploads_manager.rb
@@ -86,8 +86,9 @@ module Gitlab
         mkdir_p(File.join(uploads_export_path, secret))
 
         download_or_copy_upload(upload, upload_path)
-      rescue Errno::ENAMETOOLONG => e
-        # Do not fail entire project export if downloaded file has filename that exceeds 255 characters.
+      rescue StandardError => e
+        # Do not fail entire project export if something goes wrong during file download
+        # (e.g. downloaded file has filename that exceeds 255 characters).
         # Ignore raised exception, skip such upload, log the error and keep going with the export instead.
         Gitlab::ErrorTracking.log_exception(e, project_id: @project.id)
       end