diff --git a/Gemfile b/Gemfile index a990feb2ea7..a42490719b7 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,7 @@ gem 'view_component', '~> 2.50.0' gem 'default_value_for', '~> 3.4.0' # Supported DBs -gem 'pg', '~> 1.1' +gem 'pg', '~> 1.3.0' gem 'rugged', '~> 1.2' gem 'grape-path-helpers', '~> 1.7.0' @@ -311,7 +311,7 @@ gem 'sentry-sidekiq', '~> 5.1.1' # PostgreSQL query parsing # -gem 'pg_query', '~> 2.1' +gem 'pg_query', '~> 2.1.0' gem 'premailer-rails', '~> 1.10.3' diff --git a/Gemfile.lock b/Gemfile.lock index d21c8de0f2a..0db64ebc911 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -947,9 +947,9 @@ GEM tty-color (~> 0.5) peek (1.1.0) railties (>= 4.0.0) - pg (1.2.3) - pg_query (2.1.1) - google-protobuf (>= 3.17.1) + pg (1.3.5) + pg_query (2.1.3) + google-protobuf (>= 3.19.2) plist (3.6.0) png_quantizator (0.2.1) po_to_json (1.0.1) @@ -1630,8 +1630,8 @@ DEPENDENCIES parallel (~> 1.19) parslet (~> 1.8) peek (~> 1.1) - pg (~> 1.1) - pg_query (~> 2.1) + pg (~> 1.3.0) + pg_query (~> 2.1.0) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) prometheus-client-mmap (~> 0.15.0) diff --git a/app/assets/javascripts/access_tokens/components/access_token_table_app.vue b/app/assets/javascripts/access_tokens/components/access_token_table_app.vue index 5fe285c0896..944a2ef7f64 100644 --- a/app/assets/javascripts/access_tokens/components/access_token_table_app.vue +++ b/app/assets/javascripts/access_tokens/components/access_token_table_app.vue @@ -10,6 +10,7 @@ import { EVENT_SUCCESS, FIELDS, FORM_SELECTOR, INITIAL_PAGE, PAGE_SIZE } from '. export default { EVENT_SUCCESS, + FORM_SELECTOR, PAGE_SIZE, name: 'AccessTokenTableApp', components: { @@ -55,9 +56,6 @@ export default { filteredFields() { return this.showRole ? FIELDS : FIELDS.filter((field) => field.key !== 'role'); }, - formSelector() { - return `#${FORM_SELECTOR}`; - }, header() { return sprintf(this.$options.i18n.header, { accessTokenTypePlural: this.accessTokenTypePlural, @@ -97,7 +95,7 @@ export default {