aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorJeremy Daer <jeremydaer@gmail.com>2017-11-16 11:31:26 -0700
committerJeremy Daer <jeremydaer@gmail.com>2017-11-16 11:31:35 -0700
commit3bbc7f8f635b0d89e546c90d1b9db0683beece75 (patch)
treedfd167eb4360bcec531fa022cca7927b861d9554 /Gemfile.lock
parent66bc40b64c91e9c865994291f37204f9a1c15cf1 (diff)
downloadrails-3bbc7f8f635b0d89e546c90d1b9db0683beece75.tar.gz
rails-3bbc7f8f635b0d89e546c90d1b9db0683beece75.tar.bz2
rails-3bbc7f8f635b0d89e546c90d1b9db0683beece75.zip
Move back to resque-scheduler mainline now that https://github.com/resque/resque-scheduler/pull/620 is merged
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock21
1 files changed, 10 insertions, 11 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 4b6ed47945..8c678fa660 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,17 +7,6 @@ GIT
pg (>= 0.17, < 0.20)
GIT
- remote: https://github.com/jeremy/resque-scheduler.git
- revision: f5d56ec25ec20d939bf12d259be107f278de4044
- branch: redis-rb-4.0
- specs:
- resque-scheduler (4.3.0)
- mono_logger (~> 1.0)
- redis (>= 3.3, < 5)
- resque (~> 1.26)
- rufus-scheduler (~> 3.2)
-
-GIT
remote: https://github.com/matthewd/rb-inotify.git
revision: 856730aad4b285969e8dd621e44808a7c5af4242
branch: close-handling
@@ -35,6 +24,16 @@ GIT
websocket
GIT
+ remote: https://github.com/resque/resque-scheduler.git
+ revision: 284b862dd63967da1cf3a7e6abd9d2052067c8be
+ specs:
+ resque-scheduler (4.3.0)
+ mono_logger (~> 1.0)
+ redis (>= 3.3, < 5)
+ resque (~> 1.26)
+ rufus-scheduler (~> 3.2)
+
+GIT
remote: https://github.com/robin850/sdoc.git
revision: 0e340352f3ab2f196c8a8743f83c2ee286e4f71c
branch: upgrade