Merge branch 'master' of git://github.com/abravalheri/geocoder into abravalheri-master
Conflicts: lib/geocoder/configuration.rb lib/geocoder/stores/active_record.rb test/configuration_test.rb test/mongoid_test.rb
Showing
- lib/generators/geocoder/config/config_generator.rb 14 additions, 0 deletionslib/generators/geocoder/config/config_generator.rb
- lib/generators/geocoder/config/templates/initializer.rb 25 additions, 0 deletionslib/generators/geocoder/config/templates/initializer.rb
- lib/geocoder.rb 16 additions, 0 deletionslib/geocoder.rb
- lib/geocoder/calculations.rb 24 additions, 14 deletionslib/geocoder/calculations.rb
- lib/geocoder/configuration.rb 88 additions, 42 deletionslib/geocoder/configuration.rb
- lib/geocoder/models/active_record.rb 7 additions, 2 deletionslib/geocoder/models/active_record.rb
- lib/geocoder/models/base.rb 4 additions, 2 deletionslib/geocoder/models/base.rb
- lib/geocoder/models/mongo_base.rb 8 additions, 3 deletionslib/geocoder/models/mongo_base.rb
- lib/geocoder/stores/active_record.rb 18 additions, 8 deletionslib/geocoder/stores/active_record.rb
- lib/geocoder/stores/base.rb 6 additions, 3 deletionslib/geocoder/stores/base.rb
- lib/geocoder/stores/mongo_base.rb 3 additions, 1 deletionlib/geocoder/stores/mongo_base.rb
- test/calculations_test.rb 7 additions, 1 deletiontest/calculations_test.rb
- test/configuration_test.rb 90 additions, 0 deletionstest/configuration_test.rb
- test/custom_block_test.rb 1 addition, 0 deletionstest/custom_block_test.rb
- test/mongoid_test.rb 11 additions, 0 deletionstest/mongoid_test.rb
- test/test_helper.rb 1 addition, 0 deletionstest/test_helper.rb
Loading
Please register or sign in to comment