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

Merge branch 'next-minor' into develop

Browse source
This commit is contained in:
Steffen van Bergerem 2016-10-23 23:03:38 +02:00
commit 0b4215e961
No known key found for this signature in database
GPG key ID: 315C9787D548DC6B
2 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Gemfile
View file

@ -34,7 +34,6 @@ gem "simple_captcha2", "0.4.0", require: "simple_captcha"
# Background processing # Background processing
gem "sidekiq", "4.2.2" gem "sidekiq", "4.2.2"
gem "sinatra", "1.4.7"
# Scheduled processing # Scheduled processing

5
Gemfile.lock
View file

@ -802,10 +802,6 @@ GEM
json (>= 1.8, < 3) json (>= 1.8, < 3)
simplecov-html (~> 0.10.0) simplecov-html (~> 0.10.0)
simplecov-html (0.10.0) simplecov-html (0.10.0)
sinatra (1.4.7)
rack (~> 1.5)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
sinon-rails (1.15.0) sinon-rails (1.15.0)
railties (>= 3.1) railties (>= 3.1)
slop (3.6.0) slop (3.6.0)
@ -1034,7 +1030,6 @@ DEPENDENCIES
sidekiq-cron (= 0.4.4) sidekiq-cron (= 0.4.4)
simple_captcha2 (= 0.4.0) simple_captcha2 (= 0.4.0)
simplecov (= 0.12.0) simplecov (= 0.12.0)
sinatra (= 1.4.7)
sinon-rails (= 1.15.0) sinon-rails (= 1.15.0)
spring (= 2.0.0) spring (= 2.0.0)
spring-commands-cucumber (= 1.0.1) spring-commands-cucumber (= 1.0.1)