aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2015-12-16 13:59:00 -0700
committerSean Griffin <sean@seantheprogrammer.com>2015-12-16 13:59:00 -0700
commitf39aa4dd3995a9d11b426af7f12841d515673a4c (patch)
treeebe8af0711c3c97402f60dceb71518ba12c35380
parentbc39fa07ae20e119b9122625a10ed0e92e8839d0 (diff)
downloadrails-f39aa4dd3995a9d11b426af7f12841d515673a4c.tar.gz
rails-f39aa4dd3995a9d11b426af7f12841d515673a4c.tar.bz2
rails-f39aa4dd3995a9d11b426af7f12841d515673a4c.zip
Add mysql back to the Gemfile
I didn't mean to commit that!
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock2
2 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 879a77d767..ff75cdd090 100644
--- a/Gemfile
+++ b/Gemfile
@@ -95,7 +95,7 @@ platforms :ruby, :mswin, :mswin64, :mingw, :x64_mingw do
group :db do
gem 'pg', '>= 0.18.0'
- # gem 'mysql', '>= 2.9.0'
+ gem 'mysql', '>= 2.9.0'
gem 'mysql2', '>= 0.4.0'
end
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 94dfae9046..c39b8b049e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -373,4 +373,4 @@ DEPENDENCIES
w3c_validators
BUNDLED WITH
- 1.11.0
+ 1.11.2