nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Dennis Schubert 2015-06-01 04:44:49 +02:00
commit ee890310d3
2 changed files with 18 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Gemfile
View file

@ -139,11 +139,11 @@ gem "open_graph_reader", "0.6.1"
# Services # Services
gem "omniauth", "1.2.2" gem "omniauth", "1.2.2"
gem "omniauth-facebook", "1.6.0" gem "omniauth-facebook", "2.0.1"
gem "omniauth-tumblr", "1.1" gem "omniauth-tumblr", "1.1"
gem "omniauth-twitter", "1.0.1" gem "omniauth-twitter", "1.2.0"
gem "twitter", "4.8.1" gem "twitter", "4.8.1"
gem "omniauth-wordpress", "0.2.1" gem "omniauth-wordpress", "0.2.2"
# Serializers # Serializers

32
Gemfile.lock
View file

@ -434,7 +434,7 @@ GEM
nenv (~> 0.1) nenv (~> 0.1)
shellany (~> 0.0) shellany (~> 0.0)
oauth (0.4.7) oauth (0.4.7)
oauth2 (0.9.4) oauth2 (1.0.0)
faraday (>= 0.8, < 0.10) faraday (>= 0.8, < 0.10)
jwt (~> 1.0) jwt (~> 1.0)
multi_json (~> 1.3) multi_json (~> 1.3)
@ -443,23 +443,21 @@ GEM
omniauth (1.2.2) omniauth (1.2.2)
hashie (>= 1.2, < 4) hashie (>= 1.2, < 4)
rack (~> 1.0) rack (~> 1.0)
omniauth-facebook (1.6.0) omniauth-facebook (2.0.1)
omniauth-oauth2 (~> 1.1) omniauth-oauth2 (~> 1.2)
omniauth-oauth (1.0.1) omniauth-oauth (1.1.0)
oauth oauth
omniauth (~> 1.0) omniauth (~> 1.0)
omniauth-oauth2 (1.1.2) omniauth-oauth2 (1.3.0)
faraday (>= 0.8, < 0.10) oauth2 (~> 1.0)
multi_json (~> 1.3)
oauth2 (~> 0.9.3)
omniauth (~> 1.2) omniauth (~> 1.2)
omniauth-tumblr (1.1) omniauth-tumblr (1.1)
omniauth-oauth (~> 1.0) omniauth-oauth (~> 1.0)
omniauth-twitter (1.0.1) omniauth-twitter (1.2.0)
multi_json (~> 1.3) json (~> 1.3)
omniauth-oauth (~> 1.0) omniauth-oauth (~> 1.1)
omniauth-wordpress (0.2.1) omniauth-wordpress (0.2.2)
omniauth-oauth2 (~> 1.1.0) omniauth-oauth2 (>= 1.1.0)
open_graph_reader (0.6.1) open_graph_reader (0.6.1)
faraday (~> 0.9.0) faraday (~> 0.9.0)
nokogiri (~> 1.6) nokogiri (~> 1.6)
@ -659,7 +657,7 @@ GEM
sigar (0.7.3) sigar (0.7.3)
simple_captcha2 (0.3.4) simple_captcha2 (0.3.4)
rails (>= 4.1) rails (>= 4.1)
simple_oauth (0.2.0) simple_oauth (0.3.1)
sinatra (1.4.6) sinatra (1.4.6)
rack (~> 1.4) rack (~> 1.4)
rack-protection (~> 1.4) rack-protection (~> 1.4)
@ -785,10 +783,10 @@ DEPENDENCIES
mysql2 (= 0.3.18) mysql2 (= 0.3.18)
nokogiri (= 1.6.6.2) nokogiri (= 1.6.6.2)
omniauth (= 1.2.2) omniauth (= 1.2.2)
omniauth-facebook (= 1.6.0) omniauth-facebook (= 2.0.1)
omniauth-tumblr (= 1.1) omniauth-tumblr (= 1.1)
omniauth-twitter (= 1.0.1) omniauth-twitter (= 1.2.0)
omniauth-wordpress (= 0.2.1) omniauth-wordpress (= 0.2.2)
open_graph_reader (= 0.6.1) open_graph_reader (= 0.6.1)
pg (= 0.18.1) pg (= 0.18.1)
pry pry