Merge branch 'master' of github.com:domify/registry

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' # Money helpers
+gem 'money-rails', '~> 1.3.0', require: false # Money helpers
 
 # deploy
 gem 'whenever', '~> 0.9.4', require: false

config/application.rb

@@ -9,6 +9,9 @@ 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)

config/initializers/money.rb

@@ -1,4 +1,5 @@
 # encoding : utf-8
+require 'money-rails'
 
 MoneyRails.configure do |config|
 

spec/rails_helper.rb

@@ -7,6 +7,7 @@ require 'shoulda/matchers'
 require 'capybara/poltergeist'
 require 'paper_trail/frameworks/rspec'
 PaperTrail.whodunnit = 'autotest'
+require "money-rails/test_helpers"
 
 if ENV['ROBOT']
   require 'simplecov'