aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlec Warner <antarus@gentoo.org>2019-01-26 17:22:12 -0500
committerAlec Warner <antarus@gentoo.org>2019-01-26 17:22:12 -0500
commit97ce94b5735fa0c257e3d62f1144d78f4b08e0ec (patch)
treeea13997753a536eb4a372e7939021fe35a795424
parentSync version tag (diff)
downloadglsamaker-97ce94b5735fa0c257e3d62f1144d78f4b08e0ec.tar.gz
glsamaker-97ce94b5735fa0c257e3d62f1144d78f4b08e0ec.tar.bz2
glsamaker-97ce94b5735fa0c257e3d62f1144d78f4b08e0ec.zip
Update some gemfiles for mysql client update.2.1.13
Signed-off-by: Alec Warner <antarus@gentoo.org>
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock155
2 files changed, 84 insertions, 73 deletions
diff --git a/Gemfile b/Gemfile
index cb89df2..b5d4f91 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,7 @@ gem 'rake', '10.4.2'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
-gem 'mysql2', '~> 0.3.18'
+gem 'mysql2'
gem 'json', '~>1.8.2'
gem 'jbuilder', '~> 2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5a0de05..9884ca0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -44,70 +44,81 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
+ airbrussh (1.3.1)
+ sshkit (>= 1.6.1, != 1.7.0)
ansi (1.5.0)
- arel (6.0.3)
- builder (3.2.2)
- capistrano (3.4.0)
+ arel (6.0.4)
+ builder (3.2.3)
+ capistrano (3.11.0)
+ airbrussh (>= 1.0.0)
i18n
rake (>= 10.0.0)
- sshkit (~> 1.3)
+ sshkit (>= 1.9.0)
ci_reporter (2.0.0)
builder (>= 2.1.2)
- concurrent-ruby (1.0.0)
- daemons (1.2.3)
- diff-lcs (1.2.5)
- docile (1.1.5)
- domain_name (0.5.25)
+ concurrent-ruby (1.1.4)
+ connection_pool (2.2.2)
+ crass (1.0.4)
+ daemons (1.3.1)
+ diff-lcs (1.3)
+ docile (1.3.1)
+ domain_name (0.5.20180417)
unf (>= 0.0.5, < 1.0.0)
erubis (2.7.0)
- eventmachine (1.0.8)
+ eventmachine (1.2.7)
fastercsv (1.5.5)
- globalid (0.3.6)
- activesupport (>= 4.1.0)
- http-cookie (1.0.2)
+ globalid (0.4.2)
+ activesupport (>= 4.2.0)
+ http-cookie (1.0.3)
domain_name (~> 0.5)
- i18n (0.7.0)
+ i18n (0.9.5)
+ concurrent-ruby (~> 1.0)
innertube (1.1.0)
- jbuilder (2.5.0)
- activesupport (>= 3.0.0, < 5.1)
- multi_json (~> 1.2)
+ jbuilder (2.8.0)
+ activesupport (>= 4.2.0)
+ multi_json (>= 1.2)
joiner (0.3.4)
activerecord (>= 4.1.0)
- json (1.8.3)
- kramdown (1.9.0)
- loofah (2.0.3)
+ json (1.8.6)
+ kramdown (2.0.0)
+ loofah (2.2.3)
+ crass (~> 1.0.2)
nokogiri (>= 1.5.9)
- mail (2.6.3)
- mime-types (>= 1.16, < 3)
- mechanize (2.7.3)
+ mail (2.7.1)
+ mini_mime (>= 0.1.1)
+ mechanize (2.7.6)
domain_name (~> 0.5, >= 0.5.1)
http-cookie (~> 1.0)
- mime-types (~> 2.0)
+ mime-types (>= 1.17.2)
net-http-digest_auth (~> 1.1, >= 1.1.1)
- net-http-persistent (~> 2.5, >= 2.5.2)
- nokogiri (~> 1.4)
+ net-http-persistent (>= 2.5.2)
+ nokogiri (~> 1.6)
ntlm-http (~> 0.1, >= 0.1.1)
webrobots (>= 0.0.9, < 0.2)
middleware (0.1.0)
- mime-types (2.99)
- mini_portile2 (2.0.0)
- minitest (5.8.3)
- minitest-reporters (1.1.7)
+ mime-types (3.2.2)
+ mime-types-data (~> 3.2015)
+ mime-types-data (3.2018.0812)
+ mini_mime (1.0.1)
+ mini_portile2 (2.4.0)
+ minitest (5.11.3)
+ minitest-reporters (1.3.6)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
- multi_json (1.12.1)
- mysql2 (0.3.20)
- net-http-digest_auth (1.4)
- net-http-persistent (2.9.4)
+ multi_json (1.13.1)
+ mysql2 (0.5.2)
+ net-http-digest_auth (1.4.1)
+ net-http-persistent (3.0.0)
+ connection_pool (~> 2.2)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
- net-ssh (3.0.2)
- nokogiri (1.6.7.1)
- mini_portile2 (~> 2.0.0.rc2)
+ net-ssh (5.1.0)
+ nokogiri (1.10.1)
+ mini_portile2 (~> 2.4.0)
ntlm-http (0.1.1)
- rack (1.6.4)
+ rack (1.6.11)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.0)
@@ -123,55 +134,55 @@ GEM
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
- rails-dom-testing (1.0.7)
- activesupport (>= 4.2.0.beta, < 5.0)
- nokogiri (~> 1.6.0)
+ rails-dom-testing (1.0.9)
+ activesupport (>= 4.2.0, < 5.0)
+ nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
- rails-html-sanitizer (1.0.2)
- loofah (~> 2.0)
+ rails-html-sanitizer (1.0.4)
+ loofah (~> 2.2, >= 2.2.2)
railties (4.2.0)
actionpack (= 4.2.0)
activesupport (= 4.2.0)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.4.2)
- riddle (1.5.12)
- rspec (3.4.0)
- rspec-core (~> 3.4.0)
- rspec-expectations (~> 3.4.0)
- rspec-mocks (~> 3.4.0)
- rspec-core (3.4.1)
- rspec-support (~> 3.4.0)
- rspec-expectations (3.4.0)
+ riddle (2.3.2)
+ rspec (3.8.0)
+ rspec-core (~> 3.8.0)
+ rspec-expectations (~> 3.8.0)
+ rspec-mocks (~> 3.8.0)
+ rspec-core (3.8.0)
+ rspec-support (~> 3.8.0)
+ rspec-expectations (3.8.2)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.4.0)
- rspec-mocks (3.4.0)
+ rspec-support (~> 3.8.0)
+ rspec-mocks (3.8.0)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.4.0)
- rspec-support (3.4.1)
- ruby-progressbar (1.7.5)
- simplecov (0.11.1)
- docile (~> 1.1.0)
- json (~> 1.8)
+ rspec-support (~> 3.8.0)
+ rspec-support (3.8.0)
+ ruby-progressbar (1.10.0)
+ simplecov (0.16.1)
+ docile (~> 1.1)
+ json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
- simplecov-html (0.10.0)
- sprockets (3.5.2)
+ simplecov-html (0.10.2)
+ sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
- sprockets-rails (3.0.0)
+ sprockets-rails (3.2.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
- sshkit (1.8.1)
+ sshkit (1.18.1)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
text-format-revised (1.1.0)
text-hyphen (~> 1.2.0)
text-hyphen (1.2)
- thin (1.6.4)
+ thin (1.7.2)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
- rack (~> 1.0)
+ rack (>= 1, < 3)
thinking-sphinx (3.1.4)
activerecord (>= 3.1.0)
builder (>= 2.1.2)
@@ -179,14 +190,14 @@ GEM
joiner (>= 0.2.0)
middleware (>= 0.1.0)
riddle (>= 1.5.11)
- thor (0.19.1)
- thread_safe (0.3.5)
- tzinfo (1.2.2)
+ thor (0.20.3)
+ thread_safe (0.3.6)
+ tzinfo (1.2.5)
thread_safe (~> 0.1)
unf (0.1.4)
unf_ext
- unf_ext (0.0.7.1)
- webrobots (0.1.1)
+ unf_ext (0.0.7.5)
+ webrobots (0.1.2)
PLATFORMS
ruby
@@ -201,7 +212,7 @@ DEPENDENCIES
kramdown
mechanize
minitest-reporters
- mysql2 (~> 0.3.18)
+ mysql2
nokogiri
prototype-rails!
rails (= 4.2.0)
@@ -213,4 +224,4 @@ DEPENDENCIES
thinking-sphinx (~> 3.1.4)
BUNDLED WITH
- 1.14.6
+ 1.16.1