From: John Dong Date: Fri, 31 Aug 2007 15:50:12 +0000 (-0400) Subject: Merge jdong X-Git-Url: https://projects.mako.cc/source/selectricity/commitdiff_plain/308308e1afb8402f351d2aa2a64d27eb5b596e17?hp=8fed8cec71cd2da12b1e25be9cdca90087387e55 Merge jdong --- diff --git a/app/views/quickvote/list_voters.rhtml b/app/views/quickvote/list_voters.rhtml index be11290..ea276d7 100644 --- a/app/views/quickvote/list_voters.rhtml +++ b/app/views/quickvote/list_voters.rhtml @@ -27,14 +27,10 @@ voter.ipaddress =~ /^172\.[1-3]/ %> <% w=nil - puts "WHOIS #{voter.ipaddress}" if Cache and w=Cache.get("WHOIS:#{voter.ipaddress}") elsif Cache - puts "CREATE" w= Whois::Whois.new(IPAddr.new(voter.ipaddress),true) - puts "SEARCH" w.search_whois - puts "DONE" Cache.set("WHOIS:#{voter.ipaddress}", w) else w= Whois::Whois.new(IPAddr.new(voter.ipaddress),true) diff --git a/config/gmaps_api_key.yml b/config/gmaps_api_key.yml index 5d89d5a..b0c65fb 100644 --- a/config/gmaps_api_key.yml +++ b/config/gmaps_api_key.yml @@ -9,4 +9,4 @@ test: ABQIAAAAzMUFFnT9uH0xq39J0Y4kbhTJQa0g3IQ9GZqIMmInSLzwtGDKaBR6j135zrztfTGVOm2QlWnkaidDIQ production: - ABQIAAAAzMUFFnT9uH0Sfg98Y4kbhGFJQa0g3IQ9GZqIMmInSLrthJKGDmlRT98f4j135zat56yjRKQlWnkmod3TB + ABQIAAAA479zRK1hoNqMcKLTMuBcTRQ0mFvgRda1vOZQqJO6gQItognzGRQueA871M_O5_Q9Pd9xs4Ah4SNYTg