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:
Jonne Haß 2015-09-21 12:23:23 +02:00
commit 2601186507
2 changed files with 15 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -32,7 +32,7 @@ gem "simple_captcha2", "0.3.4", require: "simple_captcha"
# Background processing # Background processing
gem "sidekiq", "3.5.0" gem "sidekiq", "3.4.2"
gem "sinatra", "1.4.6" gem "sinatra", "1.4.6"
# Scheduled processing # Scheduled processing
@ -212,7 +212,7 @@ group :production do # we don"t install these on travis to speed up test runs
# Process management # Process management
gem "eye", "0.8.pre" gem "eye", "0.7"
# Redirects # Redirects

72
Gemfile.lock
View file

@ -85,55 +85,11 @@ GEM
activesupport (>= 3.2.0) activesupport (>= 3.2.0)
json (>= 1.7) json (>= 1.7)
mime-types (>= 1.16) mime-types (>= 1.16)
celluloid (0.17.1.2) celluloid (0.16.0)
bundler timers (~> 4.0.0)
celluloid-essentials celluloid-io (0.16.2)
celluloid-extras celluloid (>= 0.16.0)
celluloid-fsm nio4r (>= 1.1.0)
celluloid-pool
celluloid-supervision
dotenv
nenv
rspec-logsplit (>= 0.1.2)
timers (>= 4.1.1)
celluloid-essentials (0.20.2.1)
bundler
dotenv
nenv
rspec-logsplit (>= 0.1.2)
timers (>= 4.1.1)
celluloid-extras (0.20.1)
bundler
dotenv
nenv
rspec-logsplit (>= 0.1.2)
timers (>= 4.1.1)
celluloid-fsm (0.20.1)
bundler
dotenv
nenv
rspec-logsplit (>= 0.1.2)
timers (>= 4.1.1)
celluloid-io (0.17.1)
bundler
celluloid (>= 0.17.1.1)
dotenv
nenv
nio4r (>= 1.1)
rspec-logsplit (>= 0.1.2)
timers (>= 4.1.1)
celluloid-pool (0.20.1)
bundler
dotenv
nenv
rspec-logsplit (>= 0.1.2)
timers (>= 4.1.1)
celluloid-supervision (0.20.1.1)
bundler
dotenv
nenv
rspec-logsplit (>= 0.1.2)
timers (>= 4.1.1)
childprocess (0.5.6) childprocess (0.5.6)
ffi (~> 1.0, >= 1.0.11) ffi (~> 1.0, >= 1.0.11)
chunky_png (1.3.4) chunky_png (1.3.4)
@ -211,7 +167,6 @@ GEM
docile (1.1.5) docile (1.1.5)
domain_name (0.5.24) domain_name (0.5.24)
unf (>= 0.0.5, < 1.0.0) unf (>= 0.0.5, < 1.0.0)
dotenv (2.0.2)
eco (1.0.0) eco (1.0.0)
coffee-script coffee-script
eco-source eco-source
@ -230,9 +185,9 @@ GEM
eventmachine (1.0.8) eventmachine (1.0.8)
excon (0.45.4) excon (0.45.4)
execjs (2.6.0) execjs (2.6.0)
eye (0.8.pre) eye (0.7)
celluloid (~> 0.17.0) celluloid (~> 0.16.0)
celluloid-io (~> 0.17.0) celluloid-io (~> 0.16.0)
sigar (~> 0.7.3) sigar (~> 0.7.3)
state_machine state_machine
thor thor
@ -699,7 +654,6 @@ GEM
rspec-support (~> 3.3.0) rspec-support (~> 3.3.0)
rspec-instafail (0.4.0) rspec-instafail (0.4.0)
rspec rspec
rspec-logsplit (0.1.3)
rspec-mocks (3.3.2) rspec-mocks (3.3.2)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0) rspec-support (~> 3.3.0)
@ -741,8 +695,8 @@ GEM
shellany (0.0.1) shellany (0.0.1)
shoulda-matchers (2.8.0) shoulda-matchers (2.8.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
sidekiq (3.5.0) sidekiq (3.4.2)
celluloid (~> 0.17.0) celluloid (~> 0.16.0)
connection_pool (~> 2.2, >= 2.2.0) connection_pool (~> 2.2, >= 2.2.0)
json (~> 1.0) json (~> 1.0)
redis (~> 3.2, >= 3.2.1) redis (~> 3.2, >= 3.2.1)
@ -791,7 +745,7 @@ GEM
thread_safe (0.3.5) thread_safe (0.3.5)
tilt (1.4.1) tilt (1.4.1)
timecop (0.8.0) timecop (0.8.0)
timers (4.1.1) timers (4.0.4)
hitimes hitimes
twitter (5.15.0) twitter (5.15.0)
addressable (~> 2.3) addressable (~> 2.3)
@ -859,7 +813,7 @@ DEPENDENCIES
diaspora-vines (~> 0.2.0.develop) diaspora-vines (~> 0.2.0.develop)
diaspora_federation-rails (= 0.0.8) diaspora_federation-rails (= 0.0.8)
entypo-rails (= 3.0.0.pre.rc2) entypo-rails (= 3.0.0.pre.rc2)
eye (= 0.8.pre) eye (= 0.7)
factory_girl_rails (= 4.5.0) factory_girl_rails (= 4.5.0)
faraday (= 0.9.1) faraday (= 0.9.1)
faraday-cookie_jar (= 0.0.6) faraday-cookie_jar (= 0.0.6)
@ -953,7 +907,7 @@ DEPENDENCIES
sass-rails (= 5.0.4) sass-rails (= 5.0.4)
selenium-webdriver (= 2.47.1) selenium-webdriver (= 2.47.1)
shoulda-matchers (= 2.8.0) shoulda-matchers (= 2.8.0)
sidekiq (= 3.5.0) sidekiq (= 3.4.2)
sidetiq (= 0.6.3) sidetiq (= 0.6.3)
simple_captcha2 (= 0.3.4) simple_captcha2 (= 0.3.4)
simplecov (= 0.10.0) simplecov (= 0.10.0)