diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-11-28 19:06:21 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-12-04 18:15:04 +0100 |
| commit | 91ee82c54f41d830922f5504ea37a8a75a0c360b (patch) | |
| tree | 586a737509be77e5eccbf018b3d57fbc35126747 | |
| parent | 57d02099d4dbc4fc3a3c78dad3dd5fc6b5d25e9f (diff) | |
| download | gitlab-ce-91ee82c54f41d830922f5504ea37a8a75a0c360b.tar.gz | |
Update Sidekiq to 2.17.8
Conflicts:
CHANGELOG
| -rw-r--r-- | CHANGELOG | 7 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 20 |
3 files changed, 16 insertions, 13 deletions
diff --git a/CHANGELOG b/CHANGELOG index fc21dd0466a..b8d17dd276f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,10 +1,13 @@ -v 7.5.1 - - Add missing timestamps to 'members' table +v 7.5.3 + - Update Sidekiq to version 2.17.8 v 7.5.2 - Don't log Sidekiq arguments by default - Fix restore of wiki repositories from backups +v 7.5.1 + - Add missing timestamps to 'members' table + v 7.5.0 - API: Add support for Hipchat (Kevin Houdebert) - Add time zone configuration on gitlab.yml (Sullivan Senechal) @@ -112,7 +112,7 @@ gem "acts-as-taggable-on" # Background jobs gem 'slim' gem 'sinatra', require: nil -gem 'sidekiq', '2.17.0' +gem 'sidekiq', '2.17.8' # HTTP requests gem "httparty" diff --git a/Gemfile.lock b/Gemfile.lock index a3645f7bbec..c8ba018c6f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -78,7 +78,7 @@ GEM coffee-script-source (1.6.3) colored (1.2) colorize (0.5.8) - connection_pool (1.2.0) + connection_pool (2.1.0) coveralls (0.7.0) multi_json (~> 1.3) rest-client @@ -403,7 +403,7 @@ GEM rdoc (3.12.2) json (~> 1.4) redcarpet (3.1.2) - redis (3.0.6) + redis (3.1.0) redis-actionpack (4.0.0) actionpack (~> 4) redis-rack (~> 1.5.0) @@ -411,8 +411,8 @@ GEM redis-activesupport (4.0.0) activesupport (~> 4) redis-store (~> 1.1.0) - redis-namespace (1.4.1) - redis (~> 3.0.4) + redis-namespace (1.5.1) + redis (~> 3.0, >= 3.0.4) redis-rack (1.5.0) rack (~> 1.5) redis-store (~> 1.1.0) @@ -471,12 +471,12 @@ GEM sexp_processor (4.4.0) shoulda-matchers (2.1.0) activesupport (>= 3.0.0) - sidekiq (2.17.0) - celluloid (>= 0.15.2) - connection_pool (>= 1.0.0) + sidekiq (2.17.8) + celluloid (= 0.15.2) + connection_pool (~> 2.0) json - redis (>= 3.0.4) - redis-namespace (>= 1.3.1) + redis (~> 3.1) + redis-namespace (~> 1.3) simple_oauth (0.1.9) simplecov (0.9.0) docile (~> 1.1.0) @@ -685,7 +685,7 @@ DEPENDENCIES semantic-ui-sass (~> 0.16.1.0) settingslogic shoulda-matchers (~> 2.1.0) - sidekiq (= 2.17.0) + sidekiq (= 2.17.8) simplecov sinatra six |