zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-17 09:57:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove custom money fixes and upgrade money gem to latest

Browse source
This commit is contained in:
Priit Tark 2015-06-16 22:22:42 +03:00
parent 4f95802374
commit 1b66e74108
4 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -51,7 +51,7 @@ gem 'jbuilder', '~> 2.2.6' # json api
# registry specfic # registry specfic
gem 'simpleidn', '~> 0.0.5' # For punycode gem 'simpleidn', '~> 0.0.5' # For punycode
gem 'isikukood' # for EE-id validation gem 'isikukood' # for EE-id validation
gem 'money-rails', '~> 1.3.0', require: false # Money helpers gem 'money-rails', '~> 1.4.1'
# deploy # deploy
gem 'whenever', '~> 0.9.4', require: false gem 'whenever', '~> 0.9.4', require: false

4
Gemfile.lock
View file

@ -284,7 +284,7 @@ GEM
money (~> 6.5.0) money (~> 6.5.0)
money (6.5.1) money (6.5.1)
i18n (>= 0.6.4, <= 0.7.0) i18n (>= 0.6.4, <= 0.7.0)
money-rails (1.3.0) money-rails (1.4.1)
activesupport (>= 3.0) activesupport (>= 3.0)
monetize (~> 1.1.0) monetize (~> 1.1.0)
money (~> 6.5.0) money (~> 6.5.0)
@ -562,7 +562,7 @@ DEPENDENCIES
kaminari (~> 0.16.3) kaminari (~> 0.16.3)
launchy (~> 2.4.3) launchy (~> 2.4.3)
mina (~> 0.3.1) mina (~> 0.3.1)
money-rails (~> 1.3.0) money-rails (~> 1.4.1)
newrelic_rpm (~> 3.9.9.275) newrelic_rpm (~> 3.9.9.275)
nokogiri (~> 1.6.6.2) nokogiri (~> 1.6.6.2)
nprogress-rails (~> 0.1.6.7) nprogress-rails (~> 0.1.6.7)

3
config/application.rb
View file

@ -9,9 +9,6 @@ require 'action_view/railtie'
require 'sprockets/railtie' require 'sprockets/railtie'
# require "rails/test_unit/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 # Require the gems listed in Gemfile, including any gems
# you've limited to :test, :development, or :production. # you've limited to :test, :development, or :production.
Bundler.require(*Rails.groups) Bundler.require(*Rails.groups)

1
config/initializers/money.rb
View file

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