diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-09-15 23:18:52 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-09-15 23:18:52 +0200 |
| commit | 2d8c4273ef831bb3eb0dd0680d1d99f11feb6c5d (patch) | |
| tree | eb99b8947b2c1411a092c74e27d4f4aee0925b2d /Gemfile.lock | |
| parent | 757fdd34dce9a6783d4d3fa9e91f8e302590f242 (diff) | |
| download | gitlab-ce-2d8c4273ef831bb3eb0dd0680d1d99f11feb6c5d.tar.gz | |
Fix models/ci/mail_service_spec.rb
- Change Notify to Ci::Notify
- Downgrade sidekiq to fix CE errors: otherwise we need to check deliverables
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 2fd4d0dd65b..1f300b0c779 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -338,7 +338,7 @@ GEM hipchat (1.5.2) httparty mimemagic - hitimes (1.2.2) + hitimes (1.2.3) html-pipeline (1.11.0) activesupport (>= 2) nokogiri (~> 1.4) @@ -637,12 +637,12 @@ GEM shellany (0.0.1) shoulda-matchers (2.8.0) activesupport (>= 3.0.0) - sidekiq (3.4.2) - celluloid (~> 0.16.0) - connection_pool (~> 2.2, >= 2.2.0) - json (~> 1.0) - redis (~> 3.2, >= 3.2.1) - redis-namespace (~> 1.5, >= 1.5.2) + sidekiq (3.3.0) + celluloid (>= 0.16.0) + connection_pool (>= 2.0.0) + json + redis (>= 3.0.6) + redis-namespace (>= 1.3.1) sidetiq (0.6.3) celluloid (>= 0.14.1) ice_cube (= 0.11.1) @@ -710,7 +710,7 @@ GEM thor (0.19.1) thread_safe (0.3.5) tilt (1.4.1) - timers (4.0.1) + timers (4.0.4) hitimes timfel-krb5-auth (0.8.3) tinder (1.9.4) @@ -896,7 +896,7 @@ DEPENDENCIES settingslogic (~> 2.0.9) sham_rack shoulda-matchers (~> 2.8.0) - sidekiq (~> 3.3) + sidekiq (= 3.3.0) sidetiq (~> 0.6.3) simplecov (~> 0.10.0) sinatra (~> 1.4.4) |