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

Merge branch '54853-update-gitlab-styles' into 'master'

Update gitlab-styles to close #54853

Closes #54853

See merge request gitlab-org/gitlab-ce!31155
parents a92263dc 03a8f108
...@@ -321,7 +321,7 @@ GEM ...@@ -321,7 +321,7 @@ GEM
gitlab-markup (1.7.0) gitlab-markup (1.7.0)
gitlab-sidekiq-fetcher (0.4.0) gitlab-sidekiq-fetcher (0.4.0)
sidekiq (~> 5) sidekiq (~> 5)
gitlab-styles (2.7.0) gitlab-styles (2.8.0)
rubocop (~> 0.69.0) rubocop (~> 0.69.0)
rubocop-gitlab-security (~> 0.1.0) rubocop-gitlab-security (~> 0.1.0)
rubocop-performance (~> 1.1.0) rubocop-performance (~> 1.1.0)
...@@ -441,7 +441,7 @@ GEM ...@@ -441,7 +441,7 @@ GEM
jaeger-client (0.10.0) jaeger-client (0.10.0)
opentracing (~> 0.3) opentracing (~> 0.3)
thrift thrift
jaro_winkler (1.5.2) jaro_winkler (1.5.3)
jira-ruby (1.4.1) jira-ruby (1.4.1)
activesupport activesupport
multipart-post multipart-post
...@@ -837,7 +837,7 @@ GEM ...@@ -837,7 +837,7 @@ GEM
ruby-fogbugz (0.2.1) ruby-fogbugz (0.2.1)
crack (~> 0.4) crack (~> 0.4)
ruby-prof (0.17.0) ruby-prof (0.17.0)
ruby-progressbar (1.10.0) ruby-progressbar (1.10.1)
ruby-saml (1.7.2) ruby-saml (1.7.2)
nokogiri (>= 1.5.10) nokogiri (>= 1.5.10)
ruby_parser (3.13.1) ruby_parser (3.13.1)
......
...@@ -3,10 +3,8 @@ ...@@ -3,10 +3,8 @@
module TokenAuthenticatable module TokenAuthenticatable
extend ActiveSupport::Concern extend ActiveSupport::Concern
private
class_methods do class_methods do
private # rubocop:disable Lint/UselessAccessModifier private
def add_authentication_token_field(token_field, options = {}) def add_authentication_token_field(token_field, options = {})
if token_authenticatable_fields.include?(token_field) if token_authenticatable_fields.include?(token_field)
......
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