diff options
| author | Raphael Sofaer <raphael@joindiaspora.com> | 2011-05-27 04:46:21 +0400 |
|---|---|---|
| committer | Maxwell Salzberg <maxwell@joindiaspora.com> | 2011-06-04 03:22:38 +0400 |
| commit | 381b85189db652f69965676e6d02e636d2cf3a5f (patch) | |
| tree | 3bfc04286055e98a0a1f6bd962c7d0774df3a20b /Gemfile.lock | |
| parent | 8841f62cf05a7a93f9c99335e3a54c454495e7da (diff) | |
Add Chubbies, the oauth sample app, and a cucumber feature for part of an oauth flow
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 502d9d96e..e3d15cfb8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -153,7 +153,7 @@ GEM faraday (0.6.1) addressable (~> 2.2.4) multipart-post (~> 1.1.0) - rack (>= 1.1.0, < 2) + rack (< 2, >= 1.1.0) faraday_middleware (0.6.3) faraday (~> 0.6.0) fastercsv (1.5.4) @@ -183,6 +183,8 @@ GEM hashie (1.0.0) highline (1.6.2) http_connection (1.4.1) + httparty (0.7.4) + crack (= 0.1.8) i18n (0.6.0) i18n-inflector (2.5.1) i18n (>= 0.4.1) @@ -267,6 +269,9 @@ GEM oauth2 (0.4.1) faraday (~> 0.6.1) multi_json (>= 0.0.5) + oauth2-provider (0.0.16) + activesupport (~> 3.0.1) + addressable (~> 2.2) ohai (0.5.8) extlib json (<= 1.4.6, >= 1.4.4) @@ -421,6 +426,7 @@ DEPENDENCIES fuubar haml (= 3.0.25) http_accept_language! + httparty i18n-inflector-rails (~> 1.0) jammit (= 0.5.4) jasmine (= 1.0.2.1) @@ -431,6 +437,7 @@ DEPENDENCIES mysql2 (= 0.2.6) newrelic_rpm nokogiri + oauth2-provider (~> 0.0.0) ohai (= 0.5.8) omniauth (= 0.2.6) rails (= 3.0.3) @@ -445,6 +452,7 @@ DEPENDENCIES ruby-debug selenium-webdriver (= 0.1.3) settingslogic (= 2.0.6) + sinatra sod! thin (= 1.2.11) twitter (= 1.5.0) |