Merge branch 'master' of github.com:alexreisner/geocoder (f651b827) · Commits · taylor-jaydee / geocoder · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

geocoder
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

Admin message

Repositories are limited in size now to 1GB. If your repository exceeds this size, it will be automatically deleted.

Admin message

If you'd like access to our CI/CD builders, please create an issue here.

f651b827

Commit f651b827 authored 11 years ago by Alex Reisner

Downloads
- Plain Diff

Merge branch 'master' of github.com:alexreisner/geocoder

Conflicts:
	lib/geocoder/lookups/maxmind_local.rb

parents 5699eeb5 3c0859c1

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

lib/geocoder/cache.rb 3 additions, 2 deletions

lib/geocoder/cache.rb
lib/geocoder/lookups/base.rb 3 additions, 0 deletions

lib/geocoder/lookups/base.rb
lib/geocoder/lookups/cloudmade.rb 1 addition, 1 deletion

lib/geocoder/lookups/cloudmade.rb
lib/geocoder/lookups/maxmind_local.rb 1 addition, 1 deletion

lib/geocoder/lookups/maxmind_local.rb
lib/geocoder/lookups/yahoo.rb 1 addition, 1 deletion

lib/geocoder/lookups/yahoo.rb
lib/geocoder/models/base.rb 1 addition, 4 deletions

lib/geocoder/models/base.rb
lib/geocoder/railtie.rb 0 additions, 1 deletion

lib/geocoder/railtie.rb
lib/geocoder/request.rb 0 additions, 2 deletions

lib/geocoder/request.rb
lib/geocoder/results/test.rb 4 additions, 1 deletion

lib/geocoder/results/test.rb
lib/geocoder/stores/active_record.rb 1 addition, 1 deletion

lib/geocoder/stores/active_record.rb

with 15 additions and 14 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment