From 242358bb7b8e031b9b975340750be33b19015cfa Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 4 Sep 2020 03:16:09 +0000
Subject: Add latest changes from gitlab-org/gitlab@13-3-stable-ee

---
 .../jira_import/components/jira_import_form.vue    | 74 ++++++++++++++++------
 .../javascripts/jira_import/utils/constants.js     |  3 +
 .../concerns/authenticates_with_two_factor.rb      |  6 +-
 app/models/application_setting.rb                  | 18 ++++++
 app/services/git/process_ref_changes_service.rb    |  8 ++-
 app/services/jira_import/users_mapper_service.rb   |  1 +
 6 files changed, 85 insertions(+), 25 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/jira_import/components/jira_import_form.vue b/app/assets/javascripts/jira_import/components/jira_import_form.vue
index b5d17398f3a..5bf98682f92 100644
--- a/app/assets/javascripts/jira_import/components/jira_import_form.vue
+++ b/app/assets/javascripts/jira_import/components/jira_import_form.vue
@@ -23,6 +23,7 @@ import { addInProgressImportToStore } from '../utils/cache_update';
 import {
   debounceWait,
   dropdownLabel,
+  userMappingsPageSize,
   previousImportsMessage,
   tableConfig,
   userMappingMessage,
@@ -74,12 +75,15 @@ export default {
   },
   data() {
     return {
+      hasMoreUsers: false,
       isFetching: false,
+      isLoadingMoreUsers: false,
       isSubmitting: false,
       searchTerm: '',
       selectedProject: undefined,
       selectState: null,
       userMappings: [],
+      userMappingsStartAt: 0,
       users: [],
     };
   },
@@ -101,6 +105,9 @@ export default {
         ? `jira-import::${this.selectedProject}-${this.numberOfPreviousImports + 1}`
         : 'jira-import::KEY-1';
     },
+    isInitialLoadingState() {
+      return this.isLoadingMoreUsers && !this.hasMoreUsers;
+    },
   },
   watch: {
     searchTerm: debounce(function debouncedUserSearch() {
@@ -108,23 +115,7 @@ export default {
     }, debounceWait),
   },
   mounted() {
-    this.$apollo
-      .mutate({
-        mutation: getJiraUserMappingMutation,
-        variables: {
-          input: {
-            projectPath: this.projectPath,
-          },
-        },
-      })
-      .then(({ data }) => {
-        if (data.jiraImportUsers.errors.length) {
-          this.$emit('error', data.jiraImportUsers.errors.join('. '));
-        } else {
-          this.userMappings = data.jiraImportUsers.jiraUsers;
-        }
-      })
-      .catch(() => this.$emit('error', __('There was an error retrieving the Jira users.')));
+    this.getJiraUserMapping();
 
     this.searchUsers()
       .then(data => {
@@ -133,6 +124,36 @@ export default {
       .catch(() => {});
   },
   methods: {
+    getJiraUserMapping() {
+      this.isLoadingMoreUsers = true;
+
+      this.$apollo
+        .mutate({
+          mutation: getJiraUserMappingMutation,
+          variables: {
+            input: {
+              projectPath: this.projectPath,
+              startAt: this.userMappingsStartAt,
+            },
+          },
+        })
+        .then(({ data }) => {
+          if (data.jiraImportUsers.errors.length) {
+            this.$emit('error', data.jiraImportUsers.errors.join('. '));
+            return;
+          }
+
+          this.userMappings = this.userMappings.concat(data.jiraImportUsers.jiraUsers);
+          this.hasMoreUsers = data.jiraImportUsers.jiraUsers.length === userMappingsPageSize;
+          this.userMappingsStartAt += userMappingsPageSize;
+        })
+        .catch(() => {
+          this.$emit('error', __('There was an error retrieving the Jira users.'));
+        })
+        .finally(() => {
+          this.isLoadingMoreUsers = false;
+        });
+    },
     searchUsers() {
       const params = {
         active: true,
@@ -187,7 +208,9 @@ export default {
               this.selectedProject = undefined;
             }
           })
-          .catch(() => this.$emit('error', __('There was an error importing the Jira project.')))
+          .catch(() => {
+            this.$emit('error', __('There was an error importing the Jira project.'));
+          })
           .finally(() => {
             this.isSubmitting = false;
           });
@@ -280,9 +303,7 @@ export default {
           >
             <gl-search-box-by-type v-model.trim="searchTerm" class="m-2" />
 
-            <div v-if="isFetching" class="gl-text-center">
-              <gl-loading-icon />
-            </div>
+            <gl-loading-icon v-if="isFetching" />
 
             <gl-new-dropdown-item
               v-for="user in users"
@@ -300,6 +321,17 @@ export default {
         </template>
       </gl-table>
 
+      <gl-loading-icon v-if="isInitialLoadingState" />
+
+      <gl-button
+        v-if="hasMoreUsers"
+        :loading="isLoadingMoreUsers"
+        data-testid="load-more-users-button"
+        @click="getJiraUserMapping"
+      >
+        {{ __('Load more users') }}
+      </gl-button>
+
       <div class="footer-block row-content-block d-flex justify-content-between">
         <gl-button
           type="submit"
diff --git a/app/assets/javascripts/jira_import/utils/constants.js b/app/assets/javascripts/jira_import/utils/constants.js
index 6adc3e5306c..178159be009 100644
--- a/app/assets/javascripts/jira_import/utils/constants.js
+++ b/app/assets/javascripts/jira_import/utils/constants.js
@@ -27,3 +27,6 @@ export const tableConfig = [
 export const userMappingMessage = __(`Jira users have been imported from the configured Jira
   instance. They can be mapped by selecting a GitLab user from the dropdown in the "GitLab username"
   column. When the form appears, the dropdown defaults to the user conducting the import.`);
+
+// pageSize must match the MAX_USERS value in app/services/jira_import/users_mapper_service.rb
+export const userMappingsPageSize = 50;
diff --git a/app/controllers/concerns/authenticates_with_two_factor.rb b/app/controllers/concerns/authenticates_with_two_factor.rb
index 2cc51c65c26..b93c98a4790 100644
--- a/app/controllers/concerns/authenticates_with_two_factor.rb
+++ b/app/controllers/concerns/authenticates_with_two_factor.rb
@@ -129,6 +129,10 @@ module AuthenticatesWithTwoFactor
   def user_changed?(user)
     return false unless session[:user_updated_at]
 
-    user.updated_at != session[:user_updated_at]
+    # See: https://gitlab.com/gitlab-org/gitlab/-/issues/244638
+    # Rounding errors happen when the user is updated, as the Rails ActiveRecord
+    # object has higher precision than what is stored in the database, therefore
+    # using .to_i to force truncation to the timestamp
+    user.updated_at.to_i != session[:user_updated_at].to_i
   end
 end
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 661b10019ad..eb46be65858 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -426,6 +426,8 @@ class ApplicationSetting < ApplicationRecord
   end
 
   def self.create_from_defaults
+    check_schema!
+
     transaction(requires_new: true) do
       super
     end
@@ -434,6 +436,22 @@ class ApplicationSetting < ApplicationRecord
     current_without_cache
   end
 
+  # Due to the frequency with which settings are accessed, it is
+  # likely that during a backup restore a running GitLab process
+  # will insert a new `application_settings` row before the
+  # constraints have been added to the table. This would add an
+  # extra row with ID 1 and prevent the primary key constraint from
+  # being added, which made ActiveRecord throw a
+  # IrreversibleOrderError anytime the settings were accessed
+  # (https://gitlab.com/gitlab-org/gitlab/-/issues/36405).  To
+  # prevent this from happening, we do a sanity check that the
+  # primary key constraint is present before inserting a new entry.
+  def self.check_schema!
+    return if ActiveRecord::Base.connection.primary_key(self.table_name).present?
+
+    raise "The `#{self.table_name}` table is missing a primary key constraint in the database schema"
+  end
+
   # By default, the backend is Rails.cache, which uses
   # ActiveSupport::Cache::RedisStore. Since loading ApplicationSetting
   # can cause a significant amount of load on Redis, let's cache it in
diff --git a/app/services/git/process_ref_changes_service.rb b/app/services/git/process_ref_changes_service.rb
index c012c61a337..d039ed00efc 100644
--- a/app/services/git/process_ref_changes_service.rb
+++ b/app/services/git/process_ref_changes_service.rb
@@ -42,7 +42,7 @@ module Git
       push_service_class = push_service_class_for(ref_type)
 
       create_bulk_push_event = changes.size > Gitlab::CurrentSettings.push_event_activities_limit
-      merge_request_branches = merge_request_branches_for(changes)
+      merge_request_branches = merge_request_branches_for(ref_type, changes)
 
       changes.each do |change|
         push_service_class.new(
@@ -74,8 +74,10 @@ module Git
       Git::BranchPushService
     end
 
-    def merge_request_branches_for(changes)
-      @merge_requests_branches ||= MergeRequests::PushedBranchesService.new(project, current_user, changes: changes).execute
+    def merge_request_branches_for(ref_type, changes)
+      return [] if ref_type == :tag
+
+      MergeRequests::PushedBranchesService.new(project, current_user, changes: changes).execute
     end
   end
 end
diff --git a/app/services/jira_import/users_mapper_service.rb b/app/services/jira_import/users_mapper_service.rb
index b5997d77215..480c034f952 100644
--- a/app/services/jira_import/users_mapper_service.rb
+++ b/app/services/jira_import/users_mapper_service.rb
@@ -2,6 +2,7 @@
 
 module JiraImport
   class UsersMapperService
+    # MAX_USERS must match the pageSize value in app/assets/javascripts/jira_import/utils/constants.js
     MAX_USERS = 50
 
     attr_reader :jira_service, :start_at
-- 
cgit v1.2.1