summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-07-27 17:34:02 +0000
committerRobert Speicher <robert@gitlab.com>2016-07-27 17:34:02 +0000
commitb8c787208a85f6ccedab9aa3588482482303e08b (patch)
treeaa602e035fdf4ed94c636e1fb21491653bcf06be
parente9f5676aab010ace9bb45251337d8527df8278dc (diff)
parent868e42b32250192e2b05735b94976ad6c43b76cc (diff)
downloadgitlab-ce-b8c787208a85f6ccedab9aa3588482482303e08b.tar.gz
Merge branch 'cs-upgrade-rack-oauth2' into 'master'
Update rack-oauth2 from 1.2.1 to 1.2.3. Removes methods deprecated in Rails 5. Working toward #14286. Changelog: https://github.com/nov/rack-oauth2/compare/v1.2.1...v1.2.3 See merge request !5439
-rw-r--r--Gemfile.lock2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index a773c571989..b48c14148fe 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -509,7 +509,7 @@ GEM
rack-cors (0.4.0)
rack-mount (0.8.3)
rack (>= 1.0.0)
- rack-oauth2 (1.2.1)
+ rack-oauth2 (1.2.3)
activesupport (>= 2.3)
attr_required (>= 0.0.5)
httpclient (>= 2.4)