Commit Graph

47 Commits

Author SHA1 Message Date
Skud
71750889d3 added mandrill smtp settings for staging environment 2013-01-09 23:36:17 +11:00
Skud
0af986021e Generated scaffold for plantings 2012-12-19 13:30:40 +11:00
Skud
87ef580b78 Oops, missed a bit with the merge. 2012-12-05 21:08:24 +11:00
Skud
59083882d6 Merging in changes from dev to mygarden branch 2012-12-05 21:05:40 +11:00
Skud
760cf03b2c Fixed tests by getting rid of valid_session 2012-11-26 19:04:43 +11:00
Norman Ancajas
f89815b6b3 added gardens table 2012-11-05 11:45:56 +08:00
tehjaymo
32fa860dbd Created profile controller, route and view.
It's under the /profile route rather than /user to avoid clashes with
autogenerated Devise pages.
2012-10-29 22:24:26 +00:00
Skud
be029541ee and the database config 2012-10-06 21:52:40 +01:00
Skud
cac912c95f More tweaks to get staging working 2012-10-06 21:48:59 +01:00
Skud
a1f4fbde02 missed a comma 2012-10-06 21:37:14 +01:00
Skud
58d3f91b9d Deploy to staging environment
as per http://cjohansen.no/en/rails/multi_staging_environment_for_rails_using_capistrano_and_mod_rails
2012-10-06 21:33:08 +01:00
Skud
87146ac1b0 We don't need to restart twice. 2012-10-06 15:23:18 +01:00
Skud
6c4aa94a97 Rearranged the order of deploy tasks.
We want to make sure that assets:precompile runs, and that there's a
restart afterwards.
2012-10-06 15:11:39 +01:00
Skud
5fbcf95743 Merge pull request #30 from Skud/fixemailinprod2
Fixemailinprod2
2012-10-06 05:50:47 -07:00
Skud
8916b91791 This sends mail correctly on the server, using sendmail. 2012-10-06 13:46:09 +01:00
Skud
4497bb8850 Need to actually call this task 2012-10-06 13:02:07 +01:00
Skud
c5cfef04d9 Keep postgres password out of database.yml, populate it via cap deploy instead. 2012-10-06 12:45:51 +01:00
Miles Gould
7024591269 Include password for production from secret file.
We read in the file using ERB. See
http://stackoverflow.com/questions/18290/how-do-you-secure-database-yml
2012-10-03 20:59:22 +01:00
Miles Gould
79a98d6225 Only use Postgres in production. 2012-10-03 20:04:56 +01:00
Skud
7452d7ae39 Switched to postgres instead of sqlite3 2012-10-02 21:44:01 +01:00
Miles Gould
1d9c1b14fc Generate scaffold for Crops; refactor tests
Add link to Crops page from index
Refactored index/application tests to better reflect where things are.
2012-10-02 11:32:56 +01:00
Miles Gould
6454ad09ee Prevent generators from overriding our CSS. 2012-10-02 11:32:56 +01:00
Skud
f6bc259c68 precompile assets after deploying 2012-09-24 21:17:11 +01:00
Miles Gould
a2fede15e9 Don't connect to the DB when precompiling assets.
See
https://devcenter.heroku.com/articles/rails3x-asset-pipeline-cedar#troubleshooting
2012-09-24 21:05:20 +01:00
Skud
43570e5e8e fixed merge problems in Gemfile 2012-09-16 23:20:19 +01:00
Skud
927dc45147 i think i've got foundation working. maybe. 2012-09-15 11:12:04 +01:00
Skud
bc010f8e41 migrate db after deploying 2012-09-15 10:47:21 +01:00
Skud
8c8c796bc5 deploy now seems to be working 2012-09-15 10:43:17 +01:00
Skud
e2751a488c using cape to run rake tasks on dev server 2012-09-15 10:22:51 +01:00
Skud
4fa0eda475 go back to deploying this branch (not dev) for testing 2012-09-15 09:54:16 +01:00
Skud
0d5a879c4e compile assets (css etc) in production (i.e. dev) as per http://stackoverflow.com/questions/7275636/rails-3-1-0-actionviewtemplateerrror-application-css-isnt-precompiled 2012-09-15 09:50:58 +01:00
Skud
4045b676f8 tweaked capistrano config to point to the actual dev branch 2012-09-12 09:52:03 +01:00
Skud
e6c52527a7 removing line i previously commented out at passenger's suggestion 2012-09-12 09:48:39 +01:00
Skud
75ca01188d commenting out 'unshift' line as recommended by error message from passenger' 2012-09-12 09:23:49 +01:00
Miles Gould
bb3516b19c Use spork to run spec tests.
Spork initialises rails once and thereafter uses that copy of rails to
run spec tests, leading to much faster test runs. On my machine, testing
index.html.haml takes 2s instead of 7s after this change, and `rake`
takes ~9s instead of ~18s.

Instructions once again taken from
http://www.rubyinside.com/how-to-rails-3-and-rspec-2-4336.html, though I
didn't copy any code for this commit.
2012-09-10 14:54:55 +01:00
Skud
0d2630ae21 tweaked bundler flags/paths/etc 2012-09-06 18:36:18 +01:00
Skud
2255542af2 re-added this config file 2012-09-06 17:56:59 +01:00
Skud
45b4ef4ded removing the setup_load_paths thing, at least temporarily, to see if this works any better. 2012-09-06 17:48:31 +01:00
Skud
d0c919acd5 attempting to get gemset working for deploy, see http://stackoverflow.com/questions/5680341/how-to-load-passenger-from-apache-with-rvm-and-unique-gem-sets 2012-09-06 16:47:40 +01:00
Skud
b4d5f75dae added passenger gem for deployment 2012-09-06 16:23:23 +01:00
Skud
c19d98a575 capistrano deployment files. almost working? 2012-09-06 16:10:09 +01:00
Skud
a1a53de27f added mail settings for development environment 2012-09-04 17:09:57 +01:00
Skud
9792abbf87 made user accounts confirmable by email 2012-09-03 13:16:24 +01:00
Skud
dcd4f79bdc You can now login using either username or email 2012-09-03 12:38:58 +01:00
Skud
89cb3c276f added devise and rspec, set up very basic login/signup links on homepage 2012-09-03 10:49:45 +01:00
Cesy Avon
72b16c10cf Adding a home page 2012-08-23 12:56:37 -07:00
Cesy Avon
95145f2869 Moving development to top level directory 2012-08-23 10:41:00 -07:00