diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-03-26 17:16:08 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-03-26 17:16:08 +0000 |
| commit | 3adbc579bc45bf61510bc83900d07e8b0bafa088 (patch) | |
| tree | 44a41869ea5df08f478c98d20c6b21d1b4fb40fe | |
| parent | b603617e89dc95ec394c661e3f74d2969bf3b7f3 (diff) | |
| parent | bec7d063ab52b5fb2160ba6fe8e6c8efea7ad8bb (diff) | |
| download | gitlab-ce-3adbc579bc45bf61510bc83900d07e8b0bafa088.tar.gz | |
Merge branch 'update-omniauth-twitter' into 'master'
Update omniauth-twitter 1.2.0 -> 1.4
See merge request gitlab-org/gitlab-ce!17876
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -49,7 +49,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 2545514e8f5..61107a2130b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -517,7 +517,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) @@ -572,9 +572,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) @@ -1119,7 +1119,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) |