diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-07-31 07:01:30 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-07-31 07:01:30 +0000 |
| commit | e7d9d32ae792794cec442a77d6dd9679a05db8cc (patch) | |
| tree | 0a41844706e115c5e1ad60ac60ced403547902f0 | |
| parent | a92263dcf3d541673e1ad80ada9aa675195417c8 (diff) | |
| parent | 03a8f1088fa3f1c76c5b03722c62255ab8ba4cb6 (diff) | |
| download | gitlab-ce-e7d9d32ae792794cec442a77d6dd9679a05db8cc.tar.gz | |
Merge branch '54853-update-gitlab-styles' into 'master'
Update gitlab-styles to close #54853
Closes #54853
See merge request gitlab-org/gitlab-ce!31155
| -rw-r--r-- | Gemfile.lock | 6 | ||||
| -rw-r--r-- | app/models/concerns/token_authenticatable.rb | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 45f1464a5b5..f89654c82fd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -321,7 +321,7 @@ GEM gitlab-markup (1.7.0) gitlab-sidekiq-fetcher (0.4.0) sidekiq (~> 5) - gitlab-styles (2.7.0) + gitlab-styles (2.8.0) rubocop (~> 0.69.0) rubocop-gitlab-security (~> 0.1.0) rubocop-performance (~> 1.1.0) @@ -441,7 +441,7 @@ GEM jaeger-client (0.10.0) opentracing (~> 0.3) thrift - jaro_winkler (1.5.2) + jaro_winkler (1.5.3) jira-ruby (1.4.1) activesupport multipart-post @@ -837,7 +837,7 @@ GEM ruby-fogbugz (0.2.1) crack (~> 0.4) ruby-prof (0.17.0) - ruby-progressbar (1.10.0) + ruby-progressbar (1.10.1) ruby-saml (1.7.2) nokogiri (>= 1.5.10) ruby_parser (3.13.1) diff --git a/app/models/concerns/token_authenticatable.rb b/app/models/concerns/token_authenticatable.rb index 1293df571a3..4099039dd96 100644 --- a/app/models/concerns/token_authenticatable.rb +++ b/app/models/concerns/token_authenticatable.rb @@ -3,10 +3,8 @@ module TokenAuthenticatable extend ActiveSupport::Concern - private - class_methods do - private # rubocop:disable Lint/UselessAccessModifier + private def add_authentication_token_field(token_field, options = {}) if token_authenticatable_fields.include?(token_field) |