aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-09-08 14:01:04 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-09-08 14:01:04 -0300
commited3d213eb6b79218eee9bd8b4fa8ac8c147cd114 (patch)
tree0f0e837e392139a6d64776ac4f956c51302a6c33
parentf883867dd631191efb4c8b27505b5e09db5735dc (diff)
downloadrails-ed3d213eb6b79218eee9bd8b4fa8ac8c147cd114.tar.gz
rails-ed3d213eb6b79218eee9bd8b4fa8ac8c147cd114.tar.bz2
rails-ed3d213eb6b79218eee9bd8b4fa8ac8c147cd114.zip
Use released mysql2
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock9
2 files changed, 3 insertions, 8 deletions
diff --git a/Gemfile b/Gemfile
index d829a2b448..bbff1d9b42 100644
--- a/Gemfile
+++ b/Gemfile
@@ -90,7 +90,7 @@ platforms :ruby do
group :db do
gem 'pg', '>= 0.18.0'
gem 'mysql', '>= 2.9.0'
- gem 'mysql2', '>= 0.4.0', github: 'brianmario/mysql2'
+ gem 'mysql2', '>= 0.4.0'
end
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 0700980bca..44fedddc04 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -20,12 +20,6 @@ GIT
redis-namespace
GIT
- remote: git://github.com/brianmario/mysql2.git
- revision: 4d76557499b762d5a62aebb7f6a56510ad221eab
- specs:
- mysql2 (0.4.0)
-
-GIT
remote: git://github.com/mikel/mail.git
revision: 64ef1a12efcdda53fd63e1456c2c564044bf82ce
branch: master
@@ -209,6 +203,7 @@ GEM
multi_json (1.11.2)
mustache (1.0.2)
mysql (2.9.1)
+ mysql2 (0.4.0)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
nokogiri (1.6.6.2-x64-mingw32)
@@ -318,7 +313,7 @@ DEPENDENCIES
minitest (< 5.3.4)
mocha (~> 0.14)
mysql (>= 2.9.0)
- mysql2 (>= 0.4.0)!
+ mysql2 (>= 0.4.0)
nokogiri (>= 1.4.5)
pg (>= 0.18.0)
psych (~> 2.0)