diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-12-05 11:19:23 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-12-05 11:19:23 +0100 |
| commit | 705b324aea7b5246efbd3c791189fb2317d97715 (patch) | |
| tree | 1c8121c780a221540815fea2d1e7da9a03a569cb | |
| parent | e96a5dd01318e9989cf2772e476f0b988fb2dde1 (diff) | |
| download | gitlab-ce-705b324aea7b5246efbd3c791189fb2317d97715.tar.gz | |
Revert "Update Sidekiq to 2.17.8"
This reverts commit 91ee82c54f41d830922f5504ea37a8a75a0c360b.
| -rw-r--r-- | CHANGELOG | 7 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 20 |
3 files changed, 13 insertions, 16 deletions
diff --git a/CHANGELOG b/CHANGELOG index b8d17dd276f..fc21dd0466a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,13 +1,10 @@ -v 7.5.3 - - Update Sidekiq to version 2.17.8 +v 7.5.1 + - Add missing timestamps to 'members' table 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.8' +gem 'sidekiq', '2.17.0' # HTTP requests gem "httparty" diff --git a/Gemfile.lock b/Gemfile.lock index de6d7ce4f88..938ce560620 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 (2.1.0) + connection_pool (1.2.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.1.0) + redis (3.0.6) 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.5.1) - redis (~> 3.0, >= 3.0.4) + redis-namespace (1.4.1) + redis (~> 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.8) - celluloid (= 0.15.2) - connection_pool (~> 2.0) + sidekiq (2.17.0) + celluloid (>= 0.15.2) + connection_pool (>= 1.0.0) json - redis (~> 3.1) - redis-namespace (~> 1.3) + redis (>= 3.0.4) + redis-namespace (>= 1.3.1) 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.8) + sidekiq (= 2.17.0) simplecov sinatra six |