diff --git a/Gemfile b/Gemfile index 1e6e625..248aa52 100644 --- a/Gemfile +++ b/Gemfile @@ -27,8 +27,7 @@ group :development do gem 'sqlite3' end group :production do - gem 'sqlite3' - gem 'mysql' + gem 'ruby-mysql' end gem 'jquery-rails' @@ -68,3 +67,5 @@ gem 'whenever' # database export gem 'yaml_db' +gem 'mysql' + diff --git a/Gemfile.lock b/Gemfile.lock index 915fae2..e3a4e54 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -132,6 +132,7 @@ GEM json (~> 1.4) rest-client (1.6.7) mime-types (>= 1.16) + ruby-mysql (2.9.8) sass (3.1.15) sass-rails (3.2.5) railties (~> 3.2.0) @@ -190,6 +191,7 @@ DEPENDENCIES mysql rails (= 3.2.2) rake + ruby-mysql sass-rails (~> 3.2.3) sqlite3 thin diff --git a/config/environment.rb b/config/environment.rb index ad16ce3..b7ffdcc 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -1,5 +1,8 @@ # Load the rails application require File.expand_path('../application', __FILE__) +Encoding.default_external = Encoding::UTF_8 +Encoding.default_internal = Encoding::UTF_8 + # Initialize the rails application RssYeah::Application.initialize! diff --git a/config/environments/production.rb b/config/environments/production.rb index 127dbf5..3179878 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -15,7 +15,7 @@ config.assets.compress = true # Don't fallback to assets pipeline if a precompiled asset is missed - config.assets.compile = false + config.assets.compile = true # Generate digests for assets URLs config.assets.digest = true