aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2011-05-04 21:08:36 -0500
committerDavid Heinemeier Hansson <david@loudthinking.com>2011-05-04 21:08:36 -0500
commite99c1e3a3bd231a11cb2e2d5062dd1cdbcda61e2 (patch)
treefc7c02d2df28e0fb1c8d3ed1bb995713b75e2045 /railties/lib
parent169ae75e091392e3852d0dfb56fadacef4b7a20b (diff)
downloadrails-e99c1e3a3bd231a11cb2e2d5062dd1cdbcda61e2.tar.gz
rails-e99c1e3a3bd231a11cb2e2d5062dd1cdbcda61e2.tar.bz2
rails-e99c1e3a3bd231a11cb2e2d5062dd1cdbcda61e2.zip
No longer need to reference mysql2 from git
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/generators/app_base.rb10
1 files changed, 1 insertions, 9 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 998957f313..3d16304d86 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -117,15 +117,7 @@ module Rails
end
def database_gemfile_entry
- entry = options[:skip_active_record] ? "" : "gem '#{gem_for_database}'"
- if options[:database] == 'mysql'
- if options.dev? || options.edge?
- entry += ", :git => 'git://github.com/brianmario/mysql2.git'"
- else
- entry += "\n# gem 'mysql2', :git => 'git://github.com/brianmario/mysql2.git'"
- end
- end
- entry + "\n"
+ options[:skip_active_record] ? "" : "gem '#{gem_for_database}'\n"
end
def rails_gemfile_entry