aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorZachary Scott <mail@zzak.io>2017-04-23 16:32:57 +0900
committerZachary Scott <mail@zzak.io>2017-04-23 16:32:57 +0900
commit8e98cdfe633a7fc36437bfc10ae1ae656c779a7d (patch)
tree44361f3fdf2490559e1cdf831b481be42e4a42bd /Gemfile.lock
parenta6a93f9ed5af5c84cf35dc03759c0b7d9d880cd2 (diff)
downloadrails-8e98cdfe633a7fc36437bfc10ae1ae656c779a7d.tar.gz
rails-8e98cdfe633a7fc36437bfc10ae1ae656c779a7d.tar.bz2
rails-8e98cdfe633a7fc36437bfc10ae1ae656c779a7d.zip
Ask for a sane version of SDoc
This will allow me to push a release, including bug fixes, without having to update Rails everytime.
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock8
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index da7e5a8cab..445bab1ca3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -264,7 +264,7 @@ GEM
rainbow (2.2.1)
rake (12.0.0)
rb-fsevent (0.9.8)
- rdoc (5.0.0)
+ rdoc (5.1.0)
redcarpet (3.2.3)
redis (3.3.2)
redis-namespace (1.5.2)
@@ -298,8 +298,8 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
- sdoc (1.0.0.rc1)
- rdoc (= 5.0.0)
+ sdoc (1.0.0.rc2)
+ rdoc (~> 5.0)
selenium-webdriver (3.0.5)
childprocess (~> 0.5)
rubyzip (~> 1.0)
@@ -417,7 +417,7 @@ DEPENDENCIES
resque-scheduler
rubocop (>= 0.47)
sass-rails
- sdoc (= 1.0.0.rc1)
+ sdoc (> 1.0.0.rc1, < 2.0)
sequel
sidekiq
sneakers