diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2014-08-19 01:37:33 +0200 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2014-08-19 14:37:51 +0200 |
| commit | 3f161a3a3d1c2411cd80260a6eaf13eb608e0ce3 (patch) | |
| tree | c3bc821895ae24bc91f5fcdf91c4fc125cb67b28 /Gemfile.lock | |
| parent | 0b3ebb6440420de714fe5066aba19ca77e8b1b8f (diff) | |
| download | gitlab-ce-3f161a3a3d1c2411cd80260a6eaf13eb608e0ce3.tar.gz | |
Update omniauth-google-oauth2 gem
Udate doc
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f102150bc16..205599e898c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -129,7 +129,7 @@ GEM factory_girl_rails (4.3.0) factory_girl (~> 4.3.0) railties (>= 3.0.0) - faraday (0.8.8) + faraday (0.8.9) multipart-post (~> 1.2.0) faraday_middleware (0.9.0) faraday (>= 0.7.4, < 0.9) @@ -234,7 +234,7 @@ GEM activesupport (>= 4.0.1) haml (>= 3.1, < 5.0) railties (>= 4.0.1) - hashie (2.0.5) + hashie (2.1.2) hike (1.2.3) hipchat (0.14.0) httparty @@ -243,7 +243,7 @@ GEM httparty (0.13.0) json (~> 1.8) multi_xml (>= 0.5.2) - httpauth (0.2.0) + httpauth (0.2.1) i18n (0.6.11) ice_nine (0.10.0) jasmine (2.0.2) @@ -264,7 +264,7 @@ GEM jquery-ui-rails (4.2.1) railties (>= 3.2.16) json (1.8.1) - jwt (0.1.8) + jwt (0.1.13) multi_json (>= 1.5) kaminari (0.15.1) actionpack (>= 3.0.0) @@ -311,9 +311,9 @@ GEM omniauth-github (1.1.1) omniauth (~> 1.0) omniauth-oauth2 (~> 1.1) - omniauth-google-oauth2 (0.2.1) - omniauth (~> 1.0) - omniauth-oauth2 + omniauth-google-oauth2 (0.2.5) + omniauth (> 1.0) + omniauth-oauth2 (~> 1.1) omniauth-oauth (1.0.1) oauth omniauth (~> 1.0) |