Add latest changes from gitlab-org/gitlab@master

5 files changed, 35 insertions, 40 deletions

diff --git a/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js b/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js
index 414bcf186a3..eb518eb1f52 100644
--- a/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js
+++ b/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js
@@ -1,9 +1,7 @@
 import FilteredSearchTokenKeys from './filtered_search_token_keys';
 import { __ } from '~/locale';
 
-export const tokenKeys = [];
-
-tokenKeys.push(
+export const tokenKeys = [
   {
     key: 'author',
     type: 'string',
@@ -28,27 +26,23 @@ tokenKeys.push(
     icon: 'clock',
     tag: '%milestone',
   },
-);
-
-if (gon && gon.features && gon.features.releaseSearchFilter) {
-  tokenKeys.push({
+  {
     key: 'release',
     type: 'string',
     param: 'tag',
     symbol: '',
     icon: 'rocket',
     tag: __('tag name'),
-  });
-}
-
-tokenKeys.push({
-  key: 'label',
-  type: 'array',
-  param: 'name[]',
-  symbol: '~',
-  icon: 'labels',
-  tag: '~label',
-});
+  },
+  {
+    key: 'label',
+    type: 'array',
+    param: 'name[]',
+    symbol: '~',
+    icon: 'labels',
+    tag: '~label',
+  },
+];
 
 if (gon.current_user_id) {
   // Appending tokenkeys only logged-in
diff --git a/app/assets/javascripts/project_find_file.js b/app/assets/javascripts/project_find_file.js
index d6cdd37a2c3..a31034361a8 100644
--- a/app/assets/javascripts/project_find_file.js
+++ b/app/assets/javascripts/project_find_file.js
@@ -55,26 +55,21 @@ export default class ProjectFindFile {
 
   initEvent() {
     this.inputElement.off('keyup');
-    this.inputElement.on(
-      'keyup',
-      (function(_this) {
-        return function(event) {
-          const target = $(event.target);
-          const value = target.val();
-          const ref = target.data('oldValue');
-          const oldValue = ref != null ? ref : '';
-          if (value !== oldValue) {
-            target.data('oldValue', value);
-            _this.findFile();
-            return _this.element
-              .find('tr.tree-item')
-              .eq(0)
-              .addClass('selected')
-              .focus();
-          }
-        };
-      })(this),
-    );
+    this.inputElement.on('keyup', event => {
+      const target = $(event.target);
+      const value = target.val();
+      const ref = target.data('oldValue');
+      const oldValue = ref != null ? ref : '';
+      if (value !== oldValue) {
+        target.data('oldValue', value);
+        this.findFile();
+        return this.element
+          .find('tr.tree-item')
+          .eq(0)
+          .addClass('selected')
+          .focus();
+      }
+    });
   }
 
   findFile() {
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 229374c3929..f6514c4ba99 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -44,7 +44,6 @@ class Projects::IssuesController < Projects::ApplicationController
 
   before_action do
     push_frontend_feature_flag(:vue_issuable_sidebar, project.group)
-    push_frontend_feature_flag(:release_search_filter, project, default_enabled: true)
   end
 
   respond_to :html
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 69e3e7c7acb..94b5f29eff7 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -25,7 +25,6 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
 
   before_action do
     push_frontend_feature_flag(:vue_issuable_sidebar, @project.group)
-    push_frontend_feature_flag(:release_search_filter, @project, default_enabled: true)
     push_frontend_feature_flag(:async_mr_widget, @project)
   end
 
diff --git a/app/models/concerns/reactive_caching.rb b/app/models/concerns/reactive_caching.rb
index 693f9ab8dc5..45fbbef9225 100644
--- a/app/models/concerns/reactive_caching.rb
+++ b/app/models/concerns/reactive_caching.rb
@@ -122,6 +122,14 @@ module ReactiveCaching
       end
     end
 
+    # This method is used for debugging purposes and should not be used otherwise.
+    def without_reactive_cache(*args, &blk)
+      return with_reactive_cache(*args, &blk) unless Rails.env.development?
+
+      data = self.class.reactive_cache_worker_finder.call(id, *args).calculate_reactive_cache(*args)
+      yield data
+    end
+
     def clear_reactive_cache!(*args)
       Rails.cache.delete(full_reactive_cache_key(*args))
       Rails.cache.delete(alive_reactive_cache_key(*args))