Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonne Hass <mrzyx@mrzyx.de>2011-12-08 04:56:05 +0400
committerJonne Hass <mrzyx@mrzyx.de>2011-12-10 15:54:39 +0400
commit4dd55ebdada3d731b3a6afc959717da7f3e1f1c1 (patch)
treee4e94a6046c871f8b46438a1697a6301aee21903 /Gemfile.lock
parent05be43e21a620b48ed21df73885801d6c7d2727b (diff)
fix diaspora connect for the new oauth stuff WIP. There's one bug where the oauth_identifier changes but the client doesn't get informed or doesn't save it. I hope it's the last bug. Btw. this is all ugly
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock6
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 94d575d8f..5311b8e54 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -278,8 +278,8 @@ GEM
oauth2 (0.5.0)
faraday (>= 0.6.1, < 0.8)
multi_json (~> 1.0.0)
- oauth2-provider (0.0.16)
- activesupport (~> 3.0.1)
+ oauth2-provider (0.0.19)
+ activesupport (~> 3.0)
addressable (~> 2.2)
ohai (0.6.10)
mixlib-cli
@@ -483,7 +483,7 @@ DEPENDENCIES
mysql2 (= 0.2.17)
newrelic_rpm
nokogiri (~> 1.5.0)
- oauth2-provider (= 0.0.16)
+ oauth2-provider (= 0.0.19)
ohai (~> 0.6.10)
omniauth (= 1.0.1)
omniauth-facebook