Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/vue_shared/components/gl_mentions.vue

+<script>
+import escape from 'lodash/escape';
+import sanitize from 'sanitize-html';
+import Tribute from 'tributejs';
+import axios from '~/lib/utils/axios_utils';
+import { spriteIcon } from '~/lib/utils/common_utils';
+
+/**
+ * Creates the HTML template for each row of the mentions dropdown.
+ *
+ * @param original An object from the array returned from the `autocomplete_sources/members` API
+ * @returns {string} An HTML template
+ */
+function createMenuItemTemplate({ original }) {
+  const rectAvatarClass = original.type === 'Group' ? 'rect-avatar' : '';
+
+  const avatarClasses = `avatar avatar-inline center s26 ${rectAvatarClass}
+    align-items-center d-inline-flex justify-content-center`;
+
+  const avatarTag = original.avatar_url
+    ? `<img
+        src="${original.avatar_url}"
+        alt="${original.username}'s avatar"
+        class="${avatarClasses}"/>`
+    : `<div class="${avatarClasses}">${original.username.charAt(0).toUpperCase()}</div>`;
+
+  const name = escape(sanitize(original.name));
+
+  const count = original.count && !original.mentionsDisabled ? ` (${original.count})` : '';
+
+  const icon = original.mentionsDisabled
+    ? spriteIcon('notifications-off', 's16 vertical-align-middle prepend-left-5')
+    : '';
+
+  return `${avatarTag}
+    ${original.username}
+    <small class="small font-weight-normal gl-color-inherit">${name}${count}</small>
+    ${icon}`;
+}
+
+/**
+ * Creates the list of users to show in the mentions dropdown.
+ *
+ * @param inputText The text entered by the user in the mentions input field
+ * @param processValues Callback function to set the list of users to show in the mentions dropdown
+ */
+function getMembers(inputText, processValues) {
+  if (this.members) {
+    processValues(this.members);
+  } else if (this.dataSources.members) {
+    axios
+      .get(this.dataSources.members)
+      .then(response => {
+        this.members = response.data;
+        processValues(response.data);
+      })
+      .catch(() => {});
+  } else {
+    processValues([]);
+  }
+}
+
+export default {
+  name: 'GlMentions',
+  props: {
+    dataSources: {
+      type: Object,
+      required: false,
+      default: () => gl.GfmAutoComplete?.dataSources || {},
+    },
+  },
+  data() {
+    return {
+      members: undefined,
+      options: {
+        trigger: '@',
+        fillAttr: 'username',
+        lookup(value) {
+          return value.name + value.username;
+        },
+        menuItemTemplate: createMenuItemTemplate.bind(this),
+        values: getMembers.bind(this),
+      },
+    };
+  },
+  mounted() {
+    const input = this.$slots.default[0].elm;
+    this.tribute = new Tribute(this.options);
+    this.tribute.attach(input);
+  },
+  beforeDestroy() {
+    const input = this.$slots.default[0].elm;
+    if (this.tribute) {
+      this.tribute.detach(input);
+    }
+  },
+  render(h) {
+    return h('div', this.$slots.default);
+  },
+};
+</script>

app/assets/stylesheets/vendors/tribute.scss

+.tribute-container {
+  background: $white-light;
+  border: 1px solid $gl-gray-100;
+  border-radius: $border-radius-base;
+  box-shadow: 0 0 5px $issue-boards-card-shadow;
+  color: $black;
+  margin-top: $gl-padding-12;
+  max-height: 200px;
+  min-width: 120px;
+  overflow-y: auto;
+  z-index: 11110 !important;
+
+  ul {
+    list-style: none;
+    margin-bottom: 0;
+    padding: $gl-padding-8 1px;
+  }
+
+  li {
+    cursor: pointer;
+    padding: $gl-padding-8 $gl-padding;
+    white-space: nowrap;
+
+    small {
+      color: $gl-gray-500;
+    }
+
+    &.highlight {
+      background-color: $gray-darker;
+
+      .avatar {
+        @include disable-all-animation;
+        border: 1px solid $white-light;
+      }
+
+      small {
+        color: inherit;
+      }
+    }
+  }
+}

app/workers/namespaces/root_statistics_worker.rb

@@ -16,13 +16,7 @@ module Namespaces
 
       namespace.aggregation_schedule.destroy
     rescue ::Namespaces::StatisticsRefresherService::RefresherError, ActiveRecord::RecordNotFound => ex
-      log_error(namespace.full_path, ex.message) if namespace
-    end
-
-    private
-
-    def log_error(namespace_path, error_message)
-      Gitlab::SidekiqLogger.error("Namespace statistics can't be updated for #{namespace_path}: #{error_message}")
+      Gitlab::ErrorTracking.track_exception(ex, namespace_id: namespace_id, namespace: namespace&.full_path)
     end
   end
 end

app/workers/namespaces/schedule_aggregation_worker.rb

@@ -16,8 +16,8 @@ module Namespaces
       return if root_ancestor.aggregation_scheduled?
 
       Namespace::AggregationSchedule.safe_find_or_create_by!(namespace_id: root_ancestor.id)
-    rescue ActiveRecord::RecordNotFound
-      log_error(namespace_id)
+    rescue ActiveRecord::RecordNotFound => ex
+      Gitlab::ErrorTracking.track_exception(ex, namespace_id: namespace_id)
     end
 
     private
@@ -34,9 +34,5 @@ module Namespaces
 
       Namespace::AggregationSchedule.table_exists?
     end
-
-    def log_error(root_ancestor_id)
-      Gitlab::SidekiqLogger.error("Namespace can't be scheduled for aggregation: #{root_ancestor_id} does not exist")
-    end
   end
 end

config/initializers/sidekiq.rb

@@ -108,6 +108,11 @@ end
 
 Sidekiq.configure_client do |config|
   config.redis = queues_config_hash
+  # We only need to do this for other clients. If Sidekiq-server is the
+  # client scheduling jobs, we have access to the regular sidekiq logger that
+  # writes to STDOUT
+  Sidekiq.logger = Gitlab::SidekiqLogging::ClientLogger.build
+  Sidekiq.logger.formatter = Gitlab::SidekiqLogging::JSONFormatter.new if enable_json_logs
 
   config.client_middleware(&Gitlab::SidekiqMiddleware.client_configurator)
 end

config/webpack.config.js

@@ -161,7 +161,9 @@ module.exports = {
       },
       {
         test: /\.js$/,
-        exclude: path => /node_modules|vendor[\\/]assets/.test(path) && !/\.vue\.js/.test(path),
+        exclude: path =>
+          /node_modules\/(?!tributejs)|node_modules|vendor[\\/]assets/.test(path) &&
+          !/\.vue\.js/.test(path),
         loader: 'babel-loader',
         options: {
           cacheDirectory: path.join(CACHE_PATH, 'babel-loader'),

doc/administration/logs.md

@@ -400,6 +400,21 @@ For source installations, edit the `gitlab.yml` and set the Sidekiq
     log_format: json
 ```
 
+## `sidekiq_client.log`
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26586) in GitLab 12.9.
+
+This file lives in `/var/log/gitlab/gitlab-rails/sidekiq_client.log` for
+Omnibus GitLab packages or in `/home/git/gitlab/log/sidekiq_client.log` for
+installations from source.
+
+This file contains logging information about jobs before they are start
+being processed by Sidekiq, for example before being enqueued.
+
+This logfile follows the same structure as
+[`sidekiq.log`](#sidekiqlog), so it will be structured as JSON if
+you've configured this for Sidekiq as mentioned above.
+
 ## `gitlab-shell.log`
 
 This file lives in `/var/log/gitlab/gitaly/gitlab-shell.log` for

doc/api/audit_events.md

@@ -91,6 +91,10 @@ Example response:
 GET /audit_events/:id
 ```
 
+| Attribute | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `id` | integer | yes | The ID of the audit event |
+
 ```shell
 curl --header "PRIVATE-TOKEN: <your_access_token>" https://primary.example.com/api/v4/audit_events/1
 ```
@@ -195,7 +199,7 @@ GET /groups/:id/audit_events/:audit_event_id
 | Attribute | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
 | `id` | integer/string | yes | The ID or [URL-encoded path of the group](README.md#namespaced-path-encoding) |
-| `audit_event_id` | integer | yes | ID of the audit event |
+| `audit_event_id` | integer | yes | The ID of the audit event |
 
 ```shell
 curl --header "PRIVATE-TOKEN: <your_access_token>" https://primary.example.com/api/v4/groups/60/audit_events/2

doc/development/mass_insert.md

@@ -9,5 +9,5 @@ the following snippet in the rails console.
 
 ```ruby
 u = User.find(1)
-Project.last(100).each { |p| p.set_create_timestamps && p.add_maintainer(u, current_user: u) } # Change 100 to whatever number of projects you need access to
+Project.last(100).each { |p| p.set_timestamps_for_create && p.add_maintainer(u, current_user: u) } # Change 100 to whatever number of projects you need access to
 ```

lib/gitlab/sidekiq_logging/client_logger.rb

+# frozen_string_literal: true
+
+module Gitlab
+  module SidekiqLogging
+    class ClientLogger < Gitlab::Logger
+      def self.file_name_noext
+        'sidekiq_client'
+      end
+    end
+  end
+end

package.json

@@ -124,6 +124,7 @@
     "tiptap": "^1.8.0",
     "tiptap-commands": "^1.4.0",
     "tiptap-extensions": "^1.8.0",
+    "tributejs": "4.1.3",
     "underscore": "^1.9.0",
     "unfetch": "^4.1.0",
     "url-loader": "^2.1.0",

spec/frontend/vue_shared/components/gl_mentions_spec.js

+import { shallowMount } from '@vue/test-utils';
+import Tribute from 'tributejs';
+import GlMentions from '~/vue_shared/components/gl_mentions.vue';
+
+describe('GlMentions', () => {
+  let wrapper;
+
+  describe('Tribute', () => {
+    const mentions = '/gitlab-org/gitlab-test/-/autocomplete_sources/members?type=Issue&type_id=1';
+
+    beforeEach(() => {
+      wrapper = shallowMount(GlMentions, {
+        propsData: {
+          dataSources: {
+            mentions,
+          },
+        },
+        slots: {
+          default: ['<input/>'],
+        },
+      });
+    });
+
+    it('is set to tribute instance variable', () => {
+      expect(wrapper.vm.tribute instanceof Tribute).toBe(true);
+    });
+
+    it('contains the slot input element', () => {
+      wrapper.find('input').setValue('@');
+
+      expect(wrapper.vm.tribute.current.element).toBe(wrapper.find('input').element);
+    });
+  });
+});

spec/workers/namespaces/root_statistics_worker_spec.rb

@@ -42,7 +42,7 @@ describe Namespaces::RootStatisticsWorker, '#perform' do
         allow_any_instance_of(Namespace::AggregationSchedule)
           .to receive(:schedule_root_storage_statistics).and_return(nil)
 
-        expect(Gitlab::SidekiqLogger).to receive(:error).once
+        expect(Gitlab::ErrorTracking).to receive(:track_exception).once
 
         worker.perform(group.id)
       end

spec/workers/namespaces/schedule_aggregation_worker_spec.rb

@@ -48,7 +48,7 @@ describe Namespaces::ScheduleAggregationWorker, '#perform', :clean_gitlab_redis_
 
   context 'when namespace does not exist' do
     it 'logs the error' do
-      expect(Gitlab::SidekiqLogger).to receive(:error).once
+      expect(Gitlab::ErrorTracking).to receive(:track_exception).once
 
       worker.perform(12345)
     end

yarn.lock

@@ -11273,6 +11273,11 @@ tr46@^1.0.1:
   dependencies:
     punycode "^2.1.0"
 
+tributejs@4.1.3:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/tributejs/-/tributejs-4.1.3.tgz#2e1be7d9a1e403ed4c394f91d859812267e4691c"
+  integrity sha512-+VUqyi8p7tCdaqCINCWHf95E2hJFMIML180BhplTpXNooz3E2r96AONXI9qO2Ru6Ugp7MsMPJjB+rnBq+hAmzA==
+
 trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"