beyondthestory / rails_admin_map_field

A plugin for RailsAdmin to provide a Google Maps input for lat/long fields
40 stars 73 forks source link

Add lat and lon live textfields, and map resizing in config. Smaller bugfixes #7

Closed BartlomiejSkwira closed 10 years ago

BartlomiejSkwira commented 11 years ago
field :lat, :map do
  map_width '600px'
  map_height '400px'
end
beyondthestory commented 11 years ago

Hi!

Can you rebase your commits together, and rebase the whole lot against master so this pull request applies cleanly?

Thanks

Jason

BartlomiejSkwira commented 11 years ago

Hey Actually there are no tests for these features :( I'll get back to rebase after I write at least some basic tests

chrisbloom7 commented 11 years ago

Any update on this? Seems like a useful addition.

BartlomiejSkwira commented 11 years ago

OK, I think I have fraked up my repo, I was trying to rebase/squash the commits and I accidentally deleted some :cry: ..... my noobishness (I was squashing for the 1st time) had backfired. Wonder If I can get them back

chrisbloom7 commented 11 years ago

git reflog is your friend. You can rewind to almost any point in your git history. On Nov 18, 2013 9:03 AM, "BartlomiejSkwira" notifications@github.com wrote:

OK, I think I have fraked up my repo, I was trying rebase/squash the commits accidentally deleted some [image: :cry:] ..... my noobishness (I was squashing for the 1st time) had backfired. Wonder If I can get them back

— Reply to this email directly or view it on GitHubhttps://github.com/beyondthestory/rails_admin_map_field/pull/7#issuecomment-28699643 .

BartlomiejSkwira commented 10 years ago

Ok, so this branch https://github.com/BartlomiejSkwira/rails_admin_map_field/tree/pull_request_branch seems to have all of the stuff. Now what should I do: git rebase -i HEAD~26 #the number of commits that are in this pull request

in editor, pick first commit, squash the rest

Correct?

chrisbloom7 commented 10 years ago

Checkout the section "Feature Development" at http://reinh.com/blog/2009/03/02/a-git-workflow-for-agile-teams.html for info on proper squashing/rebasing of feature branches.