diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-01 18:15:24 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-01 18:15:24 +0000 |
| commit | 973f9d30d9c81a1a06670c257998f3bb8dfe43be (patch) | |
| tree | df1cbea7d14a1ea289ffc1b0f44ffbd4e00ffe89 | |
| parent | f8b5429599254a21f88abb7541ff22b21833103e (diff) | |
| parent | f732e6c8da83c46ac85dfd913f2adddaa1c8148d (diff) | |
| download | gitlab-ce-973f9d30d9c81a1a06670c257998f3bb8dfe43be.tar.gz | |
Merge branch 'pin_sidekiq_version' into 'master'
Pin gem sidekiq version
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -102,7 +102,7 @@ gem "acts-as-taggable-on" # Background jobs gem 'slim' gem 'sinatra', require: nil -gem 'sidekiq' +gem 'sidekiq', '2.17.0' # HTTP requests gem "httparty" diff --git a/Gemfile.lock b/Gemfile.lock index 1a0bce98ac5..956cf1c4984 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -653,7 +653,7 @@ DEPENDENCIES select2-rails settingslogic shoulda-matchers (~> 2.1.0) - sidekiq + sidekiq (= 2.17.0) simplecov sinatra six |