Commit dcfdc833 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'morefice/bump-gitlab-styles' into 'master'

Bump gitlab-styles v7.0.0

See merge request gitlab-org/gitlab!82008
parents bbfa2ade eddf5aa1
---
GraphQL/ArgumentUniqueness:
Exclude:
- app/graphql/resolvers/merge_requests_resolver.rb
---
GraphQL/UnusedArgument:
Exclude:
- app/graphql/mutations/jira_import/start.rb
- app/graphql/resolvers/packages_base_resolver.rb
This diff is collapsed.
This diff is collapsed.
......@@ -374,7 +374,7 @@ group :development, :test do
gem 'spring', '~> 2.1.0'
gem 'spring-commands-rspec', '~> 1.0.4'
gem 'gitlab-styles', '~> 6.6.0', require: false
gem 'gitlab-styles', '~> 7.0.0', require: false
gem 'haml_lint', '~> 0.36.0', require: false
gem 'bundler-audit', '~> 0.7.0.1', require: false
......
......@@ -501,7 +501,7 @@ GEM
openid_connect (~> 1.2)
gitlab-sidekiq-fetcher (0.8.0)
sidekiq (~> 6.1)
gitlab-styles (6.6.0)
gitlab-styles (7.0.0)
rubocop (~> 0.91, >= 0.91.1)
rubocop-gitlab-security (~> 0.1.1)
rubocop-graphql (~> 0.10)
......@@ -1115,7 +1115,7 @@ GEM
parser (>= 2.7.1.5)
rubocop-gitlab-security (0.1.1)
rubocop (>= 0.51)
rubocop-graphql (0.10.3)
rubocop-graphql (0.13.0)
rubocop (>= 0.87, < 2)
rubocop-performance (1.9.2)
rubocop (>= 0.90.0, < 2.0)
......@@ -1489,7 +1489,7 @@ DEPENDENCIES
gitlab-net-dns (~> 0.9.1)
gitlab-omniauth-openid-connect (~> 0.9.0)
gitlab-sidekiq-fetcher (= 0.8.0)
gitlab-styles (~> 6.6.0)
gitlab-styles (~> 7.0.0)
gitlab_chronic_duration (~> 0.10.6.2)
gitlab_omniauth-ldap (~> 2.1.1)
gon (~> 6.4.0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment