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

Merge pull request #4979 from jhass/bump_sidekiq

Browse source 
Bump sidekiq
This commit is contained in:
Jonne Haß 2014-08-31 02:19:29 +02:00
commit d8e264231e
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Changelog.md
View file

@ -1,5 +1,13 @@
# Head # Head
## Major Sidekiq update
This release includes a major upgrade of the background processing system Sidekiq. To upgrade cleanly:
1. Stop diaspora*
2. Run `RAILS_ENV=production bundle exec sidekiq` and wait 5-10 minutes, then stop it again (hit `CTRL+C`)
3. Do a normal upgrade of diaspora*
4. Start diaspora*
## Rails 4 - Manual action required ## Rails 4 - Manual action required
Please edit `config/initializers/secret_token.rb`, replacing `secret_token` with Please edit `config/initializers/secret_token.rb`, replacing `secret_token` with
`secret_key_base`. `secret_key_base`.

2
Gemfile
View file

@ -29,7 +29,7 @@ gem 'simple_captcha2', '0.3.2', :require => 'simple_captcha'
# Background processing # Background processing
gem 'sidekiq', '2.17.7' gem 'sidekiq', '3.2.2'
gem 'sinatra', '1.3.3' gem 'sinatra', '1.3.3'
# Compression # Compression

6
Gemfile.lock
View file

@ -426,9 +426,9 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
rubyzip (~> 1.0) rubyzip (~> 1.0)
websocket (~> 1.0.4) websocket (~> 1.0.4)
sidekiq (2.17.7) sidekiq (3.2.2)
celluloid (>= 0.15.2) celluloid (>= 0.15.2)
connection_pool (>= 1.0.0) connection_pool (>= 2.0.0)
json json
redis (>= 3.0.6) redis (>= 3.0.6)
redis-namespace (>= 1.3.1) redis-namespace (>= 1.3.1)
@ -574,7 +574,7 @@ DEPENDENCIES
ruby-oembed (= 0.8.10) ruby-oembed (= 0.8.10)
sass-rails (= 4.0.3) sass-rails (= 4.0.3)
selenium-webdriver (= 2.42.0) selenium-webdriver (= 2.42.0)
sidekiq (= 2.17.7) sidekiq (= 3.2.2)
simple_captcha2 (= 0.3.2) simple_captcha2 (= 0.3.2)
sinatra (= 1.3.3) sinatra (= 1.3.3)
sinon-rails (= 1.10.3) sinon-rails (= 1.10.3)