Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

app/assets/javascripts/search/store/actions.js

@@ -4,7 +4,7 @@ import { visitUrl, setUrlParams } from '~/lib/utils/url_utility';
 import { __ } from '~/locale';
 import { GROUPS_LOCAL_STORAGE_KEY, PROJECTS_LOCAL_STORAGE_KEY } from './constants';
 import * as types from './mutation_types';
-import { loadDataFromLS, setFrequentItemToLS } from './utils';
+import { loadDataFromLS, setFrequentItemToLS, mergeById } from './utils';
 
 export const fetchGroups = ({ commit }, search) => {
   commit(types.REQUEST_GROUPS);
@@ -41,14 +41,30 @@ export const fetchProjects = ({ commit, state }, search) => {
   }
 };
 
-export const loadFrequentGroups = ({ commit }) => {
+export const loadFrequentGroups = async ({ commit }) => {
   const data = loadDataFromLS(GROUPS_LOCAL_STORAGE_KEY);
   commit(types.LOAD_FREQUENT_ITEMS, { key: GROUPS_LOCAL_STORAGE_KEY, data });
+
+  const promises = data.map((d) => Api.group(d.id));
+  try {
+    const inflatedData = mergeById(await Promise.all(promises), data);
+    commit(types.LOAD_FREQUENT_ITEMS, { key: GROUPS_LOCAL_STORAGE_KEY, data: inflatedData });
+  } catch {
+    createFlash({ message: __('There was a problem fetching recent groups.') });
+  }
 };
 
-export const loadFrequentProjects = ({ commit }) => {
+export const loadFrequentProjects = async ({ commit }) => {
   const data = loadDataFromLS(PROJECTS_LOCAL_STORAGE_KEY);
   commit(types.LOAD_FREQUENT_ITEMS, { key: PROJECTS_LOCAL_STORAGE_KEY, data });
+
+  const promises = data.map((d) => Api.project(d.id).then((res) => res.data));
+  try {
+    const inflatedData = mergeById(await Promise.all(promises), data);
+    commit(types.LOAD_FREQUENT_ITEMS, { key: PROJECTS_LOCAL_STORAGE_KEY, data: inflatedData });
+  } catch {
+    createFlash({ message: __('There was a problem fetching recent projects.') });
+  }
 };
 
 export const setFrequentGroup = ({ state }, item) => {

app/assets/javascripts/search/store/utils.js

@@ -1,6 +1,10 @@
 import AccessorUtilities from '../../lib/utils/accessor';
 import { MAX_FREQUENT_ITEMS, MAX_FREQUENCY } from './constants';
 
+function extractKeys(object, keyList) {
+  return Object.fromEntries(keyList.map((key) => [key, object[key]]));
+}
+
 export const loadDataFromLS = (key) => {
   if (!AccessorUtilities.isLocalStorageAccessSafe()) {
     return [];
@@ -15,13 +19,16 @@ export const loadDataFromLS = (key) => {
   }
 };
 
-export const setFrequentItemToLS = (key, data, item) => {
+export const setFrequentItemToLS = (key, data, itemData) => {
   if (!AccessorUtilities.isLocalStorageAccessSafe()) {
     return;
   }
 
+  const keyList = ['id', 'avatar_url', 'name', 'full_name', 'name_with_namespace', 'frequency'];
+
   try {
-    const frequentItems = data[key];
+    const frequentItems = data[key].map((obj) => extractKeys(obj, keyList));
+    const item = extractKeys(itemData, keyList);
     const existingItemIndex = frequentItems.findIndex((i) => i.id === item.id);
 
     if (existingItemIndex >= 0) {
@@ -34,7 +41,7 @@ export const setFrequentItemToLS = (key, data, item) => {
         frequentItems.pop();
       }
 
-      frequentItems.push({ id: item.id, frequency: 1 });
+      frequentItems.push({ ...item, frequency: 1 });
     }
 
     // Sort by frequency
@@ -48,3 +55,10 @@ export const setFrequentItemToLS = (key, data, item) => {
     localStorage.removeItem(key);
   }
 };
+
+export const mergeById = (inflatedData, storedData) => {
+  return inflatedData.map((data) => {
+    const stored = storedData?.find((d) => d.id === data.id) || {};
+    return { ...stored, ...data };
+  });
+};

app/assets/javascripts/search/topbar/components/group_filter.vue

@@ -23,9 +23,6 @@ export default {
       return isEmpty(this.initialData) ? ANY_OPTION : this.initialData;
     },
   },
-  created() {
-    this.loadFrequentGroups();
-  },
   methods: {
     ...mapActions(['fetchGroups', 'setFrequentGroup', 'loadFrequentGroups']),
     handleGroupChange(group) {
@@ -52,6 +49,7 @@ export default {
     :loading="fetchingGroups"
     :selected-item="selectedGroup"
     :items="groups"
+    @first-open="loadFrequentGroups"
     @search="fetchGroups"
     @change="handleGroupChange"
   />

app/assets/javascripts/search/topbar/components/project_filter.vue

@@ -22,9 +22,6 @@ export default {
       return this.initialData ? this.initialData : ANY_OPTION;
     },
   },
-  created() {
-    this.loadFrequentProjects();
-  },
   methods: {
     ...mapActions(['fetchProjects', 'setFrequentProject', 'loadFrequentProjects']),
     handleProjectChange(project) {
@@ -55,6 +52,7 @@ export default {
     :loading="fetchingProjects"
     :selected-item="selectedProject"
     :items="projects"
+    @first-open="loadFrequentProjects"
     @search="fetchProjects"
     @change="handleProjectChange"
   />

app/assets/javascripts/search/topbar/components/searchable_dropdown.vue

@@ -65,13 +65,19 @@ export default {
   data() {
     return {
       searchText: '',
+      hasBeenOpened: false,
     };
   },
   methods: {
     isSelected(selected) {
       return selected.id === this.selectedItem.id;
     },
     openDropdown() {
+      if (!this.hasBeenOpened) {
+        this.hasBeenOpened = true;
+        this.$emit('first-open');
+      }
+
       this.$emit('search', this.searchText);
     },
     resetDropdown() {

app/graphql/types/ci/runner_type.rb

@@ -25,17 +25,17 @@ class RunnerType < BaseObject
             description: 'Indicates the runner is allowed to receive jobs.'
       field :status, ::Types::Ci::RunnerStatusEnum, null: false,
             description: 'Status of the runner.'
-      field :version, GraphQL::STRING_TYPE, null: false,
+      field :version, GraphQL::STRING_TYPE, null: true,
             description: 'Version of the runner.'
       field :short_sha, GraphQL::STRING_TYPE, null: true,
             description: %q(First eight characters of the runner's token used to authenticate new job requests. Used as the runner's unique ID.)
-      field :revision, GraphQL::STRING_TYPE, null: false,
+      field :revision, GraphQL::STRING_TYPE, null: true,
             description: 'Revision of the runner.'
       field :locked, GraphQL::BOOLEAN_TYPE, null: true,
             description: 'Indicates the runner is locked.'
       field :run_untagged, GraphQL::BOOLEAN_TYPE, null: false,
             description: 'Indicates the runner is able to run untagged jobs.'
-      field :ip_address, GraphQL::STRING_TYPE, null: false,
+      field :ip_address, GraphQL::STRING_TYPE, null: true,
             description: 'IP address of the runner.'
       field :runner_type, ::Types::Ci::RunnerTypeEnum, null: false,
             description: 'Type of the runner.'

app/models/application_setting/term.rb

@@ -3,12 +3,14 @@
 class ApplicationSetting
   class Term < ApplicationRecord
     include CacheMarkdownField
-    has_many :term_agreements
+    include NullifyIfBlank
 
-    validates :terms, presence: true
+    has_many :term_agreements
 
     cache_markdown_field :terms
 
+    nullify_if_blank :terms
+
     def self.latest
       order(:id).last
     end

app/models/integrations/campfire.rb

@@ -2,6 +2,8 @@
 
 module Integrations
   class Campfire < Integration
+    include ActionView::Helpers::UrlHelper
+
     prop_accessor :token, :subdomain, :room
     validates :token, presence: true, if: :activated?
 
@@ -13,15 +15,39 @@ def description
       'Send notifications about push events to Campfire chat rooms.'
     end
 
+    def help
+      docs_link = link_to _('Learn more.'), Rails.application.routes.url_helpers.help_page_url('api/services', anchor: 'campfire'), target: '_blank', rel: 'noopener noreferrer'
+      s_('CampfireService|Send notifications about push events to Campfire chat rooms. %{docs_link}').html_safe % { docs_link: docs_link.html_safe }
+    end
+
     def self.to_param
       'campfire'
     end
 
     def fields
       [
-        { type: 'text', name: 'token',     placeholder: '', required: true },
-        { type: 'text', name: 'subdomain', placeholder: '' },
-        { type: 'text', name: 'room',      placeholder: '' }
+        {
+          type: 'text',
+          name: 'token',
+          title: _('Campfire token'),
+          placeholder: '',
+          help: s_('CampfireService|API authentication token from Campfire.'),
+          required: true
+        },
+        {
+          type: 'text',
+          name: 'subdomain',
+          title: _('Campfire subdomain (optional)'),
+          placeholder: '',
+          help: s_('CampfireService|The %{code_open}.campfirenow.com%{code_close} subdomain.') % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe }
+        },
+        {
+          type: 'text',
+          name: 'room',
+          title: _('Campfire room ID (optional)'),
+          placeholder: '123456',
+          help: s_('CampfireService|From the end of the room URL.')
+        }
       ]
     end
 

app/services/application_settings/update_service.rb

@@ -67,10 +67,8 @@ def invalidate_markdown_cache?
     end
 
     def update_terms(terms)
-      return unless terms.present?
-
       # Avoid creating a new terms record if the text is exactly the same.
-      terms = terms.strip
+      terms = terms&.strip
       return if terms == @application_setting.terms
 
       ApplicationSetting::Term.create(terms: terms)

db/migrate/20210707151536_create_vulnerability_finding_evidence_sources.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class CreateVulnerabilityFindingEvidenceSources < ActiveRecord::Migration[6.1]
+  include Gitlab::Database::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    create_table_with_constraints :vulnerability_finding_evidence_sources do |t|
+      t.timestamps_with_timezone null: false
+
+      t.references :vulnerability_finding_evidence, index: { name: 'finding_evidence_sources_on_finding_evidence_id' }, null: false, foreign_key: { on_delete: :cascade }
+      t.text :name
+      t.text :url
+
+      t.text_limit :name, 2048
+      t.text_limit :url, 2048
+    end
+  end
+
+  def down
+    with_lock_retries do
+      drop_table :vulnerability_finding_evidence_sources
+    end
+  end
+end