Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

update gems, pull em-synchrony into gemfile for diaspora-client

  • Loading branch information...
commit 7ae3bf863a5d001d025c651c003653dfb47415b5 1 parent 80d5829
@jhass authored
Showing with 16 additions and 23 deletions.
  1. +1 −0  Gemfile
  2. +15 −23 Gemfile.lock
View
1  Gemfile
@@ -25,6 +25,7 @@ gem 'settingslogic'
# authentication
gem 'devise'
gem 'diaspora-client', :git => 'git://github.com/diaspora/diaspora-client.git'
+gem 'em-synchrony', :platforms => :ruby_19
# background processing
View
38 Gemfile.lock
@@ -4,12 +4,9 @@ GIT
specs:
diaspora-client (0.1.2)
activerecord
- em-http-request
- em-synchrony
faraday
jwt (>= 0.1.3)
oauth2 (= 0.5.0)
- rack-fiber_pool
sinatra
GEM
@@ -57,31 +54,26 @@ GEM
execjs
coffee-script-source (1.1.3)
columnize (0.3.4)
- countries (0.5.3)
+ countries (0.6.2)
currencies (= 0.4.0)
currencies (>= 0.2.0)
currencies (0.4.0)
daemons (1.1.4)
- devise (1.4.9)
+ devise (1.5.0)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3)
- warden (~> 1.0.3)
+ warden (~> 1.1)
diff-lcs (1.1.3)
- em-http-request (0.3.0)
- addressable (>= 2.0.0)
- escape_utils
- eventmachine (>= 0.12.9)
- em-synchrony (0.2.0)
- eventmachine (>= 0.12.9)
+ em-synchrony (1.0.0)
+ eventmachine (>= 1.0.0.beta.1)
erubis (2.7.0)
- escape_utils (0.2.4)
- eventmachine (0.12.10)
+ eventmachine (1.0.0.beta.4)
execjs (1.2.9)
multi_json (~> 1.0)
- factory_girl (2.2.0)
+ factory_girl (2.3.0)
activesupport
- factory_girl_rails (1.3.0)
- factory_girl (~> 2.2.0)
+ factory_girl_rails (1.4.0)
+ factory_girl (~> 2.3.0)
railties (>= 3.0.0)
faraday (0.7.5)
addressable (~> 2.2.6)
@@ -98,7 +90,7 @@ GEM
railties (~> 3.0)
hike (1.2.1)
i18n (0.6.0)
- jquery-rails (1.0.17)
+ jquery-rails (1.0.18)
railties (~> 3.0)
thor (~> 0.14)
json (1.6.1)
@@ -125,7 +117,6 @@ GEM
rack (1.3.5)
rack-cache (1.1)
rack (>= 0.4)
- rack-fiber_pool (0.9.2)
rack-mount (0.8.3)
rack (>= 1.0.0)
rack-protection (1.1.4)
@@ -194,7 +185,7 @@ GEM
ruby-debug-base19 (>= 0.11.19)
ruby_core_source (0.1.5)
archive-tar-minitar (>= 0.5.2)
- rufus-scheduler (2.0.12)
+ rufus-scheduler (2.0.13)
tzinfo (>= 0.3.23)
sass (3.1.10)
sass-rails (3.1.5)
@@ -211,7 +202,7 @@ GEM
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- thin (1.3.0)
+ thin (1.3.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
@@ -221,12 +212,12 @@ GEM
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.31)
- uglifier (1.0.4)
+ uglifier (1.1.0)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
vegas (0.1.8)
rack (>= 1.0.0)
- warden (1.0.6)
+ warden (1.1.0)
rack (>= 1.0)
PLATFORMS
@@ -238,6 +229,7 @@ DEPENDENCIES
countries
devise
diaspora-client!
+ em-synchrony
factory_girl_rails
faraday
faraday-stack
Please sign in to comment.
Something went wrong with that request. Please try again.