aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Daer <jeremydaer@gmail.com>2015-10-03 19:24:16 -0700
committerJeremy Daer <jeremydaer@gmail.com>2015-10-03 19:24:16 -0700
commitf849cfe36c585fbc58c4a5fd91b0ae1571d38bcb (patch)
tree09f6ff14e382bc20a6edaf06c9e4f5ba510f44df
parent24f9c03d52ad4c7f081cc7a9561946109b3ad500 (diff)
downloadrails-f849cfe36c585fbc58c4a5fd91b0ae1571d38bcb.tar.gz
rails-f849cfe36c585fbc58c4a5fd91b0ae1571d38bcb.tar.bz2
rails-f849cfe36c585fbc58c4a5fd91b0ae1571d38bcb.zip
YAGNI concurrent-ruby master branch now that 1.0.0.pre3 is released with fixes for warnings and circular require
-rw-r--r--Gemfile.lock8
1 files changed, 1 insertions, 7 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 7d6db0474e..636ecd78f0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -98,12 +98,6 @@ GIT
coffee-rails
GIT
- remote: git://github.com/ruby-concurrency/concurrent-ruby.git
- revision: 10ceb96c146d2937b66e7a444445e5ab9edbeb7c
- specs:
- concurrent-ruby (1.0.0.pre3)
-
-GIT
remote: git://github.com/sass/sass.git
revision: 4ef8e3167985ace91b2105916756bd93c5d7bba6
branch: stable
@@ -192,6 +186,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.9.1.1)
+ concurrent-ruby (1.0.0.pre3)
connection_pool (2.2.0)
dalli (2.7.4)
dante (0.2.0)
@@ -320,7 +315,6 @@ DEPENDENCIES
benchmark-ips
byebug
coffee-rails (~> 4.1.0)
- concurrent-ruby (~> 1.0.0.pre3)!
dalli (>= 2.2.1)
delayed_job
delayed_job_active_record