diff --git a/Gemfile b/Gemfile index e88c96d7cff..8f8bde4fb06 100644 --- a/Gemfile +++ b/Gemfile @@ -41,7 +41,7 @@ gem 'omniauth-oauth2-generic', '~> 0.2.2' gem 'omniauth-saml', '~> 1.10' gem 'omniauth-shibboleth', '~> 1.3.0' gem 'omniauth-twitter', '~> 1.4' -gem 'omniauth_crowd', '~> 2.2.0' +gem 'omniauth_crowd', '~> 2.4.0' gem 'omniauth-authentiq', '~> 0.3.3' gem 'omniauth_openid_connect', '~> 0.3.5' gem 'omniauth-salesforce', '~> 1.0.5' @@ -188,7 +188,7 @@ gem 'acts-as-taggable-on', '~> 6.0' # Background jobs gem 'sidekiq', '~> 5.2.7' gem 'sidekiq-cron', '~> 1.0' -gem 'redis-namespace', '~> 1.6.0' +gem 'redis-namespace', '~> 1.7.0' gem 'gitlab-sidekiq-fetcher', '0.5.2', require: 'sidekiq-reliable-fetch' # Cron Parser diff --git a/Gemfile.lock b/Gemfile.lock index a15b4ea3bdb..15b0faa02ee 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -740,7 +740,7 @@ GEM omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack - omniauth_crowd (2.2.3) + omniauth_crowd (2.4.0) activesupport nokogiri (>= 1.4.4) omniauth (~> 1.0) @@ -877,7 +877,7 @@ GEM redis-activesupport (5.2.0) activesupport (>= 3, < 7) redis-store (>= 1.3, < 2) - redis-namespace (1.6.0) + redis-namespace (1.7.0) redis (>= 3.0.4) redis-rack (2.1.2) rack (>= 2.0.8, < 3) @@ -1337,7 +1337,7 @@ DEPENDENCIES omniauth-saml (~> 1.10) omniauth-shibboleth (~> 1.3.0) omniauth-twitter (~> 1.4) - omniauth_crowd (~> 2.2.0) + omniauth_crowd (~> 2.4.0) omniauth_openid_connect (~> 0.3.5) org-ruby (~> 0.9.12) parallel (~> 1.19) @@ -1365,7 +1365,7 @@ DEPENDENCIES re2 (~> 1.2.0) recaptcha (~> 4.11) redis (~> 4.0) - redis-namespace (~> 1.6.0) + redis-namespace (~> 1.7.0) redis-rails (~> 5.0.2) request_store (~> 1.5) responders (~> 3.0) diff --git a/app/assets/javascripts/incidents/components/incidents_list.vue b/app/assets/javascripts/incidents/components/incidents_list.vue index f15aed739eb..ee2560a0328 100644 --- a/app/assets/javascripts/incidents/components/incidents_list.vue +++ b/app/assets/javascripts/incidents/components/incidents_list.vue @@ -11,7 +11,7 @@ import { } from '@gitlab/ui'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import { s__ } from '~/locale'; -import { mergeUrlParams } from '~/lib/utils/url_utility'; +import { mergeUrlParams, joinPaths, visitUrl } from '~/lib/utils/url_utility'; import getIncidents from '../graphql/queries/get_incidents.query.graphql'; import { I18N } from '../constants'; @@ -19,7 +19,7 @@ const tdClass = 'table-col gl-display-flex d-md-table-cell gl-align-items-center gl-white-space-nowrap'; const thClass = 'gl-hover-bg-blue-50'; const bodyTrClass = - 'gl-border-1 gl-border-t-solid gl-border-gray-100 gl-hover-bg-blue-50 gl-hover-border-b-solid gl-hover-border-blue-200'; + 'gl-border-1 gl-border-t-solid gl-border-gray-100 gl-hover-cursor-pointer gl-hover-bg-blue-50 gl-hover-border-b-solid gl-hover-border-blue-200'; export default { i18n: I18N, @@ -56,7 +56,7 @@ export default { directives: { GlTooltip: GlTooltipDirective, }, - inject: ['projectPath', 'newIssuePath', 'incidentTemplateName'], + inject: ['projectPath', 'newIssuePath', 'incidentTemplateName', 'issuePath'], apollo: { incidents: { query: getIncidents, @@ -102,6 +102,9 @@ export default { hasAssignees(assignees) { return Boolean(assignees.nodes?.length); }, + navigateToIncidentDetails({ iid }) { + return visitUrl(joinPaths(this.issuePath, iid)); + }, }, }; @@ -138,6 +141,7 @@ export default { :tbody-tr-class="tbodyTrClass" :no-local-sorting="true" fixed + @row-clicked="navigateToIncidentDetails" >