diff --git a/Gemfile b/Gemfile index a0850118f..38ee1fd7d 100644 --- a/Gemfile +++ b/Gemfile @@ -51,7 +51,7 @@ gem 'jbuilder', '~> 2.2.6' # json api # registry specfic gem 'simpleidn', '~> 0.0.5' # For punycode gem 'isikukood' # for EE-id validation -gem 'money-rails', '~> 1.3.0', require: false # Money helpers +gem 'money-rails', '~> 1.4.1' # deploy gem 'whenever', '~> 0.9.4', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 8cd15356c..9ce7c41bc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -284,7 +284,7 @@ GEM money (~> 6.5.0) money (6.5.1) i18n (>= 0.6.4, <= 0.7.0) - money-rails (1.3.0) + money-rails (1.4.1) activesupport (>= 3.0) monetize (~> 1.1.0) money (~> 6.5.0) @@ -562,7 +562,7 @@ DEPENDENCIES kaminari (~> 0.16.3) launchy (~> 2.4.3) mina (~> 0.3.1) - money-rails (~> 1.3.0) + money-rails (~> 1.4.1) newrelic_rpm (~> 3.9.9.275) nokogiri (~> 1.6.6.2) nprogress-rails (~> 0.1.6.7) diff --git a/config/application.rb b/config/application.rb index 70b6d3ae3..9931ce25e 100644 --- a/config/application.rb +++ b/config/application.rb @@ -9,9 +9,6 @@ require 'action_view/railtie' require 'sprockets/railtie' # require "rails/test_unit/railtie" -# fix, otherwise rake db:all:setup not working -require 'money-rails/hooks' - # Require the gems listed in Gemfile, including any gems # you've limited to :test, :development, or :production. Bundler.require(*Rails.groups) diff --git a/config/initializers/money.rb b/config/initializers/money.rb index 52bee2ee9..30df8eadf 100644 --- a/config/initializers/money.rb +++ b/config/initializers/money.rb @@ -1,5 +1,4 @@ # encoding : utf-8 -require 'money-rails' MoneyRails.configure do |config|