Commit Graph

12 Commits

Author SHA1 Message Date
Skud
bf6bb7f620 Moved mandrill config to figaro 2014-04-29 13:07:23 +10:00
Skud
13fcf9db4b added deprecation notice to credentials.example 2014-04-29 12:30:56 +10:00
Skud
1c34d428f2 Merge branch 'crop-search' of https://github.com/Skud/growstuff into Skud-crop-search
Conflicts:
	spec/models/crop_spec.rb
2014-04-29 11:16:20 +10:00
Skud
74e1e07567 tweaking secret key settings to match what heroku already has 2014-04-28 12:42:23 +10:00
Skud
28c789f85c Update to ruby 2.1.1 and various gem tweaks to go with it 2014-04-28 12:33:43 +10:00
Skud
8588d0f901 Added a bit more info about mailchimp lists
(not really part of this story, was just hanging around, sorry)
2014-01-03 21:25:54 +11:00
Skud
a75ed5090a Hardcode Cloudmade API key.
Ugh, I know. But it's not any less secure than having it out there in
our Javascript, and it turns out Heroku just downright *refuses* to read
it from an environment variable during asset compilation. I even tried
an experimental Heroku addon
(https://devcenter.heroku.com/articles/labs-user-env-compile) but it
didn't work, so for now let's just do this and get it out there. I'm
sick of messing with it.
2013-09-11 18:03:19 +10:00
Miles Gould
4701bd1b2e Merge branch 'dev' into places2
Conflicts:
	Gemfile.lock
	config/application.rb
	credentials.example
2013-08-31 15:49:30 +01:00
Skud
f747db7518 newsletter subscription/unsubscription via Mailchimp API 2013-08-27 22:45:18 +10:00
Ryan Clark
fe00146f22 Added map to places/index 2013-08-06 19:38:11 -07:00
Skud
df1cded83c added flickr key/secret 2013-04-30 22:10:05 +10:00
Skud
c56666e68f added credentials.example 2013-04-30 10:11:22 +10:00