summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPirate Praveen <praveen@debian.org>2018-03-20 07:52:10 +0100
committerPirate Praveen <praveen@debian.org>2018-03-20 07:52:10 +0100
commitbec7d063ab52b5fb2160ba6fe8e6c8efea7ad8bb (patch)
tree36743facde5717f84806945188c015ddab1a2583
parent5f6754185fc8bca6bb510a0aa17410dbffa293ff (diff)
downloadgitlab-ce-bec7d063ab52b5fb2160ba6fe8e6c8efea7ad8bb.tar.gz
Update omniauth-twitter 1.2.0 -> 1.4
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock8
2 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index e423f4ba32f..b497774716b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -36,7 +36,7 @@ gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
gem 'omniauth-oauth2-generic', '~> 0.2.2'
gem 'omniauth-saml', '~> 1.10'
gem 'omniauth-shibboleth', '~> 1.2.0'
-gem 'omniauth-twitter', '~> 1.2.0'
+gem 'omniauth-twitter', '~> 1.4'
gem 'omniauth_crowd', '~> 2.2.0'
gem 'omniauth-authentiq', '~> 0.3.1'
gem 'rack-oauth2', '~> 1.2.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 1c6c7edb1a0..5510b301399 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -515,7 +515,7 @@ GEM
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
numerizer (0.1.1)
- oauth (0.5.1)
+ oauth (0.5.4)
oauth2 (1.4.0)
faraday (>= 0.8, < 0.13)
jwt (~> 1.0)
@@ -570,9 +570,9 @@ GEM
ruby-saml (~> 1.7)
omniauth-shibboleth (1.2.1)
omniauth (>= 1.0.0)
- omniauth-twitter (1.2.1)
- json (~> 1.3)
+ omniauth-twitter (1.4.0)
omniauth-oauth (~> 1.1)
+ rack
omniauth_crowd (2.2.3)
activesupport
nokogiri (>= 1.4.4)
@@ -1117,7 +1117,7 @@ DEPENDENCIES
omniauth-oauth2-generic (~> 0.2.2)
omniauth-saml (~> 1.10)
omniauth-shibboleth (~> 1.2.0)
- omniauth-twitter (~> 1.2.0)
+ omniauth-twitter (~> 1.4)
omniauth_crowd (~> 2.2.0)
org-ruby (~> 0.9.12)
peek (~> 1.0.1)