Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Revert "For users without both postgres and mysql installed, be a lit…

…tle more intelligent about the related gems"

This reverts commit ce80cf4.
  • Loading branch information...
commit fcd64dc63cfd60b4c143c6ad4855d25a3ef09037 1 parent 2555f4f
@gbprz gbprz authored
Showing with 13 additions and 20 deletions.
  1. +13 −20 Gemfile
View
33 Gemfile
@@ -40,6 +40,19 @@ gem 'bootstrap-datepicker-rails'
gem 'jquery-timepicker-rails'
gem 'twitter-bootstrap-rails-confirm'
+# In production we prefer MySQL over sqlite3. If you are only
+# interested in development and don't want to bother with production,
+# run `bundle install --without production` to ignore MySQL.
+gem "sqlite3", :group => [:development, :test]
+
+require "#{Dir.getwd}/lib/command_check.rb"
+if system_has_mysql?
+ gem "mysql2", :require => false, :group => :production
+end
+if system_has_postgres?
+ gem "pg", :require => false, :group => :production
+end
+
#RMagick is used for image resizing and processing
gem "rmagick", ">= 2.12.2", :require => 'RMagick', :platforms => :ruby
@@ -64,26 +77,6 @@ gem 'strong_parameters'
gem 'kaminari', '0.14.1' # Pagination
-require "#{Dir.getwd}/lib/command_check.rb"
-if system_has_mysql?
- mysql_platforms = Bundler::Dependency::PLATFORM_MAP.keys
-else
- mysql_platforms = []
-end
-if system_has_postgres?
- postgres_platforms = Bundler::Dependency::PLATFORM_MAP.keys
-else
- postgres_platforms = []
-end
-
-# In production we prefer MySQL over sqlite3. If you are only
-# interested in development and don't want to bother with production,
-# run `bundle install --without production` to ignore MySQL.
-gem "sqlite3", :group => [:development, :test]
-
-gem "mysql2", :require => false, :group => :production, :platforms => mysql_platforms
-gem "pg", :require => false, :group => :production, :platforms => postgres_platforms
-
# Enable the newsfeed for 1.9+ users.
pa_platforms = [:ruby_19, :ruby_20, :ruby_21]
pa_platforms &= Bundler::Dependency::PLATFORM_MAP.keys
Please sign in to comment.
Something went wrong with that request. Please try again.