Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/error_tracking/components/stacktrace_entry.vue

 <script>
-import { __, sprintf } from '~/locale';
 import { GlTooltip } from '@gitlab/ui';
+import { __, sprintf } from '~/locale';
 import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
 import FileIcon from '~/vue_shared/components/file_icon.vue';
 import Icon from '~/vue_shared/components/icon.vue';

app/assets/javascripts/filtered_search/filtered_search_manager.js

 import _ from 'underscore';
+import recentSearchesStorageKeys from 'ee_else_ce/filtered_search/recent_searches_storage_keys';
 import { getParameterByName, getUrlParamsArray } from '~/lib/utils/common_utils';
 import IssuableFilteredSearchTokenKeys from '~/filtered_search/issuable_filtered_search_token_keys';
-import recentSearchesStorageKeys from 'ee_else_ce/filtered_search/recent_searches_storage_keys';
 import { visitUrl } from '../lib/utils/url_utility';
 import Flash from '../flash';
 import FilteredSearchContainer from './container';

app/assets/javascripts/filtered_search/visual_token_value.js

 import _ from 'underscore';
+import { USER_TOKEN_TYPES } from 'ee_else_ce/filtered_search/constants';
 import FilteredSearchContainer from '~/filtered_search/container';
 import FilteredSearchVisualTokens from '~/filtered_search/filtered_search_visual_tokens';
 import AjaxCache from '~/lib/utils/ajax_cache';
@@ -6,7 +7,6 @@ import DropdownUtils from '~/filtered_search/dropdown_utils';
 import Flash from '~/flash';
 import UsersCache from '~/lib/utils/users_cache';
 import { __ } from '~/locale';
-import { USER_TOKEN_TYPES } from 'ee_else_ce/filtered_search/constants';
 export default class VisualTokenValue {
   constructor(tokenValue, tokenType) {

app/assets/javascripts/frequent_items/components/app.vue

 <script>
 import { mapState, mapActions, mapGetters } from 'vuex';
-import AccessorUtilities from '~/lib/utils/accessor';
 import { GlLoadingIcon } from '@gitlab/ui';
+import AccessorUtilities from '~/lib/utils/accessor';
 import eventHub from '../event_hub';
 import store from '../store/';
 import { FREQUENT_ITEMS, STORAGE_KEY } from '../constants';

app/assets/javascripts/grafana_integration/components/grafana_integration.vue

 <script>
 import { GlButton, GlFormGroup, GlFormInput, GlFormCheckbox, GlLink } from '@gitlab/ui';
-import Icon from '~/vue_shared/components/icon.vue';
 import { mapState, mapActions } from 'vuex';
+import Icon from '~/vue_shared/components/icon.vue';
 export default {
   components: {

app/assets/javascripts/groups/components/app.vue

@@ -2,13 +2,13 @@
 /* global Flash */
 import $ from 'jquery';
+import { GlLoadingIcon } from '@gitlab/ui';
 import { s__, sprintf } from '~/locale';
 import DeprecatedModal from '~/vue_shared/components/deprecated_modal.vue';
 import { HIDDEN_CLASS } from '~/lib/utils/constants';
 import { getParameterByName } from '~/lib/utils/common_utils';
 import { mergeUrlParams } from '~/lib/utils/url_utility';
-import { GlLoadingIcon } from '@gitlab/ui';
 import eventHub from '../event_hub';
 import { COMMON_STR, CONTENT_LIST_CLASS } from '../constants';
 import groupsComponent from './groups.vue';

app/assets/stylesheets/pages/profile.scss

@@ -17,12 +17,6 @@
   display: inline-block;
 }
-.account-btn-link,
-.profile-settings-sidebar a,
-.settings-sidebar a {
-  color: $blue-600;
-}
-
 .private-tokens-reset div.reset-action:not(:first-child) {
   padding-top: 15px;
 }
@@ -122,24 +116,12 @@
       float: left;
     }
   }
-
-  .description {
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    overflow: hidden;
-  }
 }
 .key-created-at {
   line-height: 42px;
 }
-.profile-settings-content {
-  a {
-    color: $blue-600;
-  }
-}
-
 .provider-btn-group {
   display: inline-block;
   margin-right: 10px;
@@ -169,10 +151,6 @@
   margin-left: -3px;
   line-height: 22px;
   background-color: $gray-light;
-
-  &.not-active {
-    color: $blue-500;
-  }
 }
 .oauth-applications {
@@ -292,10 +270,6 @@ table.u2f-registrations {
 }
 .oauth-application-show {
-  .scope-name {
-    font-weight: $gl-font-weight-bold;
-  }
-
   .scopes-list {
     padding-left: 18px;
   }
@@ -317,52 +291,52 @@ table.u2f-registrations {
   .landing {
     padding: 32px;
-    .close {
-      position: absolute;
-      top: 20px;
-      right: 20px;
-      opacity: 1;
-      .dismiss-icon {
-        float: right;
-        cursor: pointer;
-        color: $blue-300;
-      }
-      &:hover {
-        background-color: transparent;
-        border: 0;
-        .dismiss-icon {
-          color: $blue-400;
-        }
+  }
+  .close {
+    position: absolute;
+    top: 20px;
+    right: 20px;
+    opacity: 1;
+    .dismiss-icon {
+      float: right;
+      cursor: pointer;
+      color: $blue-300;
+    }
+    &:hover {
+      background-color: transparent;
+      border: 0;
+      .dismiss-icon {
+        color: $blue-400;
       }
     }
-    .svg-container {
-      margin-right: 30px;
-      display: inline-block;
-      svg {
-        height: 110px;
-        vertical-align: top;
-      }
-      &.devops {
-        margin: 0 0 0 30px;
-        svg {
-          height: 127px;
-        }
+  }
+  .svg-container {
+    margin-right: 30px;
+    display: inline-block;
+    svg {
+      height: 110px;
+      vertical-align: top;
+    }
+    &.convdev {
+      margin: 0 0 0 30px;
+      svg {
+        height: 127px;
       }
     }
-    .user-callout-copy {
-      display: inline-block;
-      vertical-align: top;
-      max-width: 570px;
-    }
+  }
+  .user-callout-copy {
+    display: inline-block;
+    vertical-align: top;
+    max-width: 570px;
   }
   @include media-breakpoint-down(xs) {
@@ -372,43 +346,26 @@ table.u2f-registrations {
       display: block;
     }
-    .landing {
-      .svg-container,
-      .user-callout-copy {
-        margin: 0 auto;
-        display: block;
-        svg {
-          height: 75px;
-        }
-        &.devops {
-          margin: $gl-padding auto 0;
-          svg {
-            height: 120px;
-          }
+    .svg-container,
+    .user-callout-copy {
+      margin: 0 auto;
+      display: block;
+      svg {
+        height: 75px;
+      }
+      &.convdev {
+        margin: $gl-padding auto 0;
+        svg {
+          height: 120px;
         }
       }
     }
   }
 }
-.nav-wip {
-  border: 1px solid $blue-500;
-  background: $blue-50;
-  padding: $gl-padding;
-  margin-bottom: $gl-padding;
-
-  a {
-    color: $blue-500;
-  }
-
-  p:last-child {
-    margin-bottom: 0;
-  }
-}
-
 .email-badge {
   display: inline;
   margin-right: $gl-padding / 2;
@@ -433,10 +390,8 @@ table.u2f-registrations {
 }
 .edit-user {
-  .clear-user-status {
-    svg {
-      fill: $gl-text-color-secondary;
-    }
+  svg {
+    fill: $gl-text-color-secondary;
   }
   .form-group > label {
@@ -453,10 +408,6 @@ table.u2f-registrations {
     .no-emoji-placeholder {
       position: relative;
-
-      svg {
-        fill: $gl-text-color-secondary;
-      }
     }
   }

app/assets/stylesheets/utilities.scss

@@ -31,3 +31,4 @@
 .gl-w-64 { width: px-to-rem($grid-size * 8); }
 .gl-h-64 { height: px-to-rem($grid-size * 8); }
+.gl-bg-blue-500 { @include gl-bg-blue-500; }

app/views/profiles/accounts/_providers.html.haml

@@ -16,6 +16,6 @@
             %a.provider-btn
               = s_('Profiles|Active')
         - elsif link_allowed
-          = link_to omniauth_authorize_path(:user, provider), method: :post, class: 'provider-btn not-active' do
+          = link_to omniauth_authorize_path(:user, provider), method: :post, class: 'provider-btn gl-bg-blue-500' do
             = s_('Profiles|Connect')
   = render_if_exists 'profiles/accounts/group_saml_unlink_buttons', group_saml_identities: group_saml_identities

app/views/profiles/gpg_keys/_key.html.haml

@@ -5,7 +5,7 @@
     - key.emails_with_verified_status.map do |email, verified|
       = render partial: 'shared/email_with_badge', locals: { email: email, verified: verified }
-    .description
+    %span.text-truncate
       %code= key.fingerprint
     - if key.subkeys.present?
       .subkeys

app/views/profiles/keys/_key.html.haml

@@ -10,7 +10,7 @@
   .key-list-item-info
     = link_to path_to_key(key, is_admin), class: "title" do
       = key.title
-    .description
+    %span.text-truncate
       = key.fingerprint
     .last-used-at
       last used:

app/views/profiles/passwords/edit.html.haml

@@ -32,4 +32,4 @@
       .prepend-top-default.append-bottom-default
         = f.submit _('Save password'), class: "btn btn-success append-right-10", data: { qa_selector: 'save_password_button' }
         - unless @user.password_automatically_set?
-          = link_to _('I forgot my password'), reset_profile_password_path, method: :put, class: "account-btn-link"
+          = link_to _('I forgot my password'), reset_profile_password_path, method: :put

app/views/shared/tokens/_scopes_list.html.haml

@@ -9,5 +9,5 @@
     %ul.scopes-list.append-bottom-0
       - token.scopes.each do |scope|
         %li
-          %span.scope-name= scope
+          %span.bold= scope
           = "(#{t(scope, scope: [:doorkeeper, :scopes])})"

changelogs/unreleased/bridge-rules.yml

+---
+title: Added rules configuration for Ci::Bridge
+merge_request: 19605
+author:
+type: added

lib/feature/gitaly.rb

@@ -10,6 +10,7 @@ class Feature
         inforef_uploadpack_cache
         get_all_lfs_pointers_go
         get_tag_messages_go
+        filter_shas_with_signatures_go
       ].freeze
     DEFAULT_ON_FLAGS = Set.new([]).freeze

lib/gitlab/ci/config/entry/job.rb

@@ -173,7 +173,7 @@ module Gitlab
               @entries.delete(:type)
               # This is something of a hack, see issue for details:
-              # https://gitlab.com/gitlab-org/gitlab-foss/issues/67150
+              # https://gitlab.com/gitlab-org/gitlab/issues/31685
               if !only_defined? && has_rules?
                 @entries.delete(:only)
                 @entries.delete(:except)

lib/gitlab/diff/highlight_cache.rb

@@ -54,6 +54,15 @@ module Gitlab
       private
+      # We create a Gitlab::Diff::DeprecatedHighlightCache here in order to
+      #   expire deprecated cache entries while we make the transition. This can
+      #   be removed when :hset_redis_diff_caching is fully launched.
+      # See https://gitlab.com/gitlab-org/gitlab/issues/38008
+      #
+      def deprecated_cache
+        @deprecated_cache ||= Gitlab::Diff::DeprecatedHighlightCache.new(@diff_collection)
+      end
+
       def uncached_files
         diff_files = @diff_collection.diff_files
@@ -85,6 +94,10 @@ module Gitlab
             redis.expire(key, EXPIRATION)
           end
         end
+
+        # Clean up any deprecated hash entries
+        #
+        deprecated_cache.clear
       end
       def file_paths

spec/frontend/monitoring/charts/time_series_spec.js

 import { shallowMount } from '@vue/test-utils';
 import { setTestTimeout } from 'helpers/timeout';
-import { createStore } from '~/monitoring/stores';
 import { GlLink } from '@gitlab/ui';
 import { GlAreaChart, GlLineChart, GlChartSeriesLabel } from '@gitlab/ui/dist/charts';
 import { shallowWrapperContainsSlotText } from 'helpers/vue_test_utils_helper';
+import { createStore } from '~/monitoring/stores';
 import TimeSeries from '~/monitoring/components/charts/time_series.vue';
 import * as types from '~/monitoring/stores/mutation_types';
 import {

spec/frontend/monitoring/components/charts/anomaly_spec.js

+import { shallowMount } from '@vue/test-utils';
+import { TEST_HOST } from 'helpers/test_constants';
 import Anomaly from '~/monitoring/components/charts/anomaly.vue';
-import { shallowMount } from '@vue/test-utils';
 import { colorValues } from '~/monitoring/constants';
 import {
   anomalyDeploymentData,
@@ -8,7 +9,6 @@ import {
   anomalyMockGraphData,
   anomalyMockResultValues,
 } from '../../mock_data';
-import { TEST_HOST } from 'helpers/test_constants';
 import MonitorTimeSeriesChart from '~/monitoring/components/charts/time_series.vue';
 const mockWidgets = 'mockWidgets';

spec/frontend/monitoring/embed/embed_spec.js

 import { createLocalVue, shallowMount } from '@vue/test-utils';
 import Vuex from 'vuex';
-import Embed from '~/monitoring/components/embed.vue';
 import PanelType from 'ee_else_ce/monitoring/components/panel_type.vue';
 import { TEST_HOST } from 'helpers/test_constants';
+import Embed from '~/monitoring/components/embed.vue';
 import { groups, initialState, metricsData, metricsWithData } from './mock_data';
 const localVue = createLocalVue();