Skip to content

Commit 76642d7

Browse files
committed
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
2 parents 7070942 + 08e6798 commit 76642d7

File tree

2 files changed

+5
-26
lines changed

2 files changed

+5
-26
lines changed

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ group :development do
215215
gem "annotate", "~> 2.6.0"
216216
gem "letter_opener", '~> 1.1.2'
217217
gem 'quiet_assets', '~> 1.0.2'
218-
gem 'rerun', '~> 0.10.0'
218+
gem 'rerun', '~> 0.11.0'
219219
gem 'bullet', require: false
220220
gem 'rblineprof', platform: :mri, require: false
221221
gem 'web-console', '~> 2.0'

Gemfile.lock

+4-25
Original file line numberDiff line numberDiff line change
@@ -117,23 +117,6 @@ GEM
117117
activemodel (>= 3.2.0)
118118
activesupport (>= 3.2.0)
119119
json (>= 1.7)
120-
celluloid (0.17.2)
121-
celluloid-essentials
122-
celluloid-extras
123-
celluloid-fsm
124-
celluloid-pool
125-
celluloid-supervision
126-
timers (>= 4.1.1)
127-
celluloid-essentials (0.20.5)
128-
timers (>= 4.1.1)
129-
celluloid-extras (0.20.5)
130-
timers (>= 4.1.1)
131-
celluloid-fsm (0.20.5)
132-
timers (>= 4.1.1)
133-
celluloid-pool (0.20.5)
134-
timers (>= 4.1.1)
135-
celluloid-supervision (0.20.5)
136-
timers (>= 4.1.1)
137120
charlock_holmes (0.7.3)
138121
chunky_png (1.3.5)
139122
cliver (0.3.2)
@@ -369,7 +352,6 @@ GEM
369352
hipchat (1.5.2)
370353
httparty
371354
mimemagic
372-
hitimes (1.2.3)
373355
html-pipeline (1.11.0)
374356
activesupport (>= 2)
375357
nokogiri (~> 1.4)
@@ -410,8 +392,7 @@ GEM
410392
addressable (~> 2.3)
411393
letter_opener (1.1.2)
412394
launchy (~> 2.2)
413-
listen (2.9.0)
414-
celluloid (>= 0.15.2)
395+
listen (3.0.5)
415396
rb-fsevent (>= 0.9.3)
416397
rb-inotify (>= 0.9)
417398
loofah (2.0.3)
@@ -601,8 +582,8 @@ GEM
601582
redis-store (1.1.7)
602583
redis (>= 2.2)
603584
request_store (1.2.1)
604-
rerun (0.10.0)
605-
listen (~> 2.7, >= 2.7.3)
585+
rerun (0.11.0)
586+
listen (~> 3.0)
606587
responders (2.1.0)
607588
railties (>= 4.2.0, < 5)
608589
rest-client (1.8.0)
@@ -759,8 +740,6 @@ GEM
759740
thor (0.19.1)
760741
thread_safe (0.3.5)
761742
tilt (1.4.1)
762-
timers (4.1.1)
763-
hitimes
764743
timfel-krb5-auth (0.8.3)
765744
tinder (1.10.1)
766745
eventmachine (~> 1.0)
@@ -941,7 +920,7 @@ DEPENDENCIES
941920
redis-namespace
942921
redis-rails (~> 4.0.0)
943922
request_store (~> 1.2.0)
944-
rerun (~> 0.10.0)
923+
rerun (~> 0.11.0)
945924
responders (~> 2.0)
946925
rouge (~> 1.10.1)
947926
rqrcode-rails3 (~> 0.1.7)

0 commit comments

Comments
 (0)