diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-03-12 15:24:40 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-03-12 15:24:40 +0000 |
| commit | 1d9b1ae3e71e46e2cf39f2bfe79642ace415bcac (patch) | |
| tree | 4a17b5894b345b6e646fe58129835438e9c97cbe | |
| parent | cedeebf7bcbfe7dd006edb853e6c84d0c504c1a1 (diff) | |
| parent | 1ed25069e1cfbaaf42be5ef025f6d5d4e9fca7e2 (diff) | |
| download | gitlab-ce-1d9b1ae3e71e46e2cf39f2bfe79642ace415bcac.tar.gz | |
Merge branch 'update-rack-oauth2' into 'master'
Update rack-oauth2 1.2.1 -> 1.9.3
Closes #21732
See merge request gitlab-org/gitlab-ce!17868
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 16 | ||||
| -rw-r--r-- | changelogs/unreleased/update-rack-oauth2.yml | 5 |
3 files changed, 14 insertions, 9 deletions
@@ -42,7 +42,7 @@ gem 'omniauth-shibboleth', '~> 1.3.0' gem 'omniauth-twitter', '~> 1.4' gem 'omniauth_crowd', '~> 2.2.0' gem 'omniauth-authentiq', '~> 0.3.3' -gem 'rack-oauth2', '~> 1.2.1' +gem 'rack-oauth2', '~> 1.9.3' gem 'jwt', '~> 2.1.0' # Spam and anti-bot protection diff --git a/Gemfile.lock b/Gemfile.lock index 634029e03de..1e59e0d56a3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -65,7 +65,7 @@ GEM atomic (1.1.99) attr_encrypted (3.1.0) encryptor (~> 3.0.0) - attr_required (1.0.0) + attr_required (1.0.1) awesome_print (1.8.0) axiom-types (0.1.1) descendants_tracker (~> 0.0.4) @@ -622,12 +622,12 @@ GEM rack-attack (4.4.1) rack rack-cors (1.0.2) - rack-oauth2 (1.2.3) - activesupport (>= 2.3) - attr_required (>= 0.0.5) - httpclient (>= 2.4) - multi_json (>= 1.3.6) - rack (>= 1.1) + rack-oauth2 (1.9.3) + activesupport + attr_required + httpclient + json-jwt (>= 1.9.0) + rack rack-protection (2.0.5) rack rack-proxy (0.6.0) @@ -1103,7 +1103,7 @@ DEPENDENCIES rack (= 2.0.6) rack-attack (~> 4.4.1) rack-cors (~> 1.0.0) - rack-oauth2 (~> 1.2.1) + rack-oauth2 (~> 1.9.3) rack-proxy (~> 0.6.0) rails (= 5.0.7.1) rails-controller-testing diff --git a/changelogs/unreleased/update-rack-oauth2.yml b/changelogs/unreleased/update-rack-oauth2.yml new file mode 100644 index 00000000000..dc2e7017695 --- /dev/null +++ b/changelogs/unreleased/update-rack-oauth2.yml @@ -0,0 +1,5 @@ +--- +title: Update rack-oauth2 1.2.1 -> 1.9.3 +merge_request: 17868 +author: +type: other |