Merge branch 'feature/remove-celluloid' into 'master'

Update rerun to remove celluloid as dependency After sidekiq 4 migration, we no longer need celluloid. `rerun` recent version also removed it from its dependency, so by getting this MR merged, we can solve #3797 See merge request !2088

Merge branch 'feature/remove-celluloid' into 'master'
76642d7a · Dmitriy Zaporozhets · 70709425 · 08e67983 · 76642d7a · 76642d7a
Commit 76642d7a authored Dec 16, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 26 deletions

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +4 -25

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -215,7 +215,7 @@ group :development do
  gem "annotate", "~> 2.6.0"
  gem "letter_opener", '~> 1.1.2'
  gem 'quiet_assets', '~> 1.0.2'
-  gem 'rerun', '~> 0.10.0'
+  gem 'rerun', '~> 0.11.0'
  gem 'bullet', require: false
  gem 'rblineprof', platform: :mri, require: false
  gem 'web-console', '~> 2.0'

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -117,23 +117,6 @@ GEM
      activemodel (>= 3.2.0)
      activesupport (>= 3.2.0)
      json (>= 1.7)
-    celluloid (0.17.2)
-      celluloid-essentials
-      celluloid-extras
-      celluloid-fsm
-      celluloid-pool
-      celluloid-supervision
-      timers (>= 4.1.1)
-    celluloid-essentials (0.20.5)
-      timers (>= 4.1.1)
-    celluloid-extras (0.20.5)
-      timers (>= 4.1.1)
-    celluloid-fsm (0.20.5)
-      timers (>= 4.1.1)
-    celluloid-pool (0.20.5)
-      timers (>= 4.1.1)
-    celluloid-supervision (0.20.5)
-      timers (>= 4.1.1)
    charlock_holmes (0.7.3)
    chunky_png (1.3.5)
    cliver (0.3.2)
@@ -369,7 +352,6 @@ GEM
    hipchat (1.5.2)
      httparty
      mimemagic
-    hitimes (1.2.3)
    html-pipeline (1.11.0)
      activesupport (>= 2)
      nokogiri (~> 1.4)
@@ -410,8 +392,7 @@ GEM
      addressable (~> 2.3)
    letter_opener (1.1.2)
      launchy (~> 2.2)
-    listen (2.9.0)
-      celluloid (>= 0.15.2)
+    listen (3.0.5)
      rb-fsevent (>= 0.9.3)
      rb-inotify (>= 0.9)
    loofah (2.0.3)
@@ -601,8 +582,8 @@ GEM
    redis-store (1.1.7)
      redis (>= 2.2)
    request_store (1.2.1)
-    rerun (0.10.0)
-      listen (~> 2.7, >= 2.7.3)
+    rerun (0.11.0)
+      listen (~> 3.0)
    responders (2.1.0)
      railties (>= 4.2.0, < 5)
    rest-client (1.8.0)
@@ -759,8 +740,6 @@ GEM
    thor (0.19.1)
    thread_safe (0.3.5)
    tilt (1.4.1)
-    timers (4.1.1)
-      hitimes
    timfel-krb5-auth (0.8.3)
    tinder (1.10.1)
      eventmachine (~> 1.0)
@@ -941,7 +920,7 @@ DEPENDENCIES
  redis-namespace
  redis-rails (~> 4.0.0)
  request_store (~> 1.2.0)
-  rerun (~> 0.10.0)
+  rerun (~> 0.11.0)
  responders (~> 2.0)
  rouge (~> 1.10.1)
  rqrcode-rails3 (~> 0.1.7)