From 8e98cdfe633a7fc36437bfc10ae1ae656c779a7d Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Sun, 23 Apr 2017 16:32:57 +0900 Subject: Ask for a sane version of SDoc This will allow me to push a release, including bug fixes, without having to update Rails everytime. --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Gemfile.lock') 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 -- cgit v1.2.3 From 4d07e1c60b6db210efe584d32a160fef4a228ea9 Mon Sep 17 00:00:00 2001 From: Yasuo Honda Date: Thu, 4 May 2017 13:29:22 +0000 Subject: Use mysql2 0.4.6 to suport MySQL 8.0.1 Follow up #28733 and brianmario/mysql2#840 --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 445bab1ca3..3b2da57428 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -222,9 +222,9 @@ GEM multi_json (1.12.1) multipart-post (2.0.0) mustache (1.0.3) - mysql2 (0.4.5) - mysql2 (0.4.5-x64-mingw32) - mysql2 (0.4.5-x86-mingw32) + mysql2 (0.4.6) + mysql2 (0.4.6-x64-mingw32) + mysql2 (0.4.6-x86-mingw32) nio4r (2.0.0) nokogiri (1.7.0.1) mini_portile2 (~> 2.1.0) -- cgit v1.2.3 From 626f3d608868afed3aa725e3b6e0a5ce82b5e968 Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Thu, 4 May 2017 17:14:22 +0900 Subject: Don't pass `arel.engine` to `Arel::SelectManager.new` The argument of `Arel::SelectManager.new` is `table`, not `engine`. https://github.com/rails/arel/blob/v8.0.0/lib/arel/select_manager.rb#L10 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 3b2da57428..d516d52a4c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -25,7 +25,7 @@ GIT GIT remote: https://github.com/rails/arel.git - revision: 437aa3a4bb8ad4f3f4eba299dbb1112852f9c7ac + revision: 5db56a513286814991c27000af2c0243cc19d1e2 specs: arel (8.0.0) -- cgit v1.2.3 From 673a5644ace7a0cdb814f68026224ff843ccb221 Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Fri, 5 May 2017 10:23:59 -0500 Subject: Allow capybara minor releases Capybara 2.14.0 was released. Loosen the tight constraint in the generated Gemfile, so that Rails applications can take advantage of the new version --- Gemfile.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index d516d52a4c..ad0ec7be0c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -91,7 +91,7 @@ PATH GEM remote: https://rubygems.org/ specs: - addressable (2.5.0) + addressable (2.5.1) public_suffix (~> 2.0, >= 2.0.2) amq-protocol (2.1.0) ast (2.3.0) @@ -125,7 +125,7 @@ GEM bunny (2.6.2) amq-protocol (>= 2.0.1) byebug (9.0.6) - capybara (2.13.0) + capybara (2.14.0) addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -226,11 +226,11 @@ GEM mysql2 (0.4.6-x64-mingw32) mysql2 (0.4.6-x86-mingw32) nio4r (2.0.0) - nokogiri (1.7.0.1) + nokogiri (1.7.1) mini_portile2 (~> 2.1.0) - nokogiri (1.7.0.1-x64-mingw32) + nokogiri (1.7.1-x64-mingw32) mini_portile2 (~> 2.1.0) - nokogiri (1.7.0.1-x86-mingw32) + nokogiri (1.7.1-x86-mingw32) mini_portile2 (~> 2.1.0) parser (2.4.0.0) ast (~> 2.2) @@ -383,7 +383,7 @@ DEPENDENCIES blade blade-sauce_labs_plugin byebug - capybara (~> 2.13.0) + capybara (~> 2.13) coffee-rails dalli (>= 2.2.1) delayed_job -- cgit v1.2.3 From 6086fbaecf57cde96d00dcd7ea776263dd4b3e79 Mon Sep 17 00:00:00 2001 From: "yuuji.yaginuma" Date: Tue, 16 May 2017 07:25:56 +0900 Subject: Bump rack version --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index ad0ec7be0c..26a7fa8b0e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -249,7 +249,7 @@ GEM simple_uuid que (0.12.0) racc (1.4.14) - rack (2.0.1) + rack (2.0.3) rack-cache (1.6.1) rack (>= 0.4) rack-protection (1.5.3) -- cgit v1.2.3