Skud 89a5a777e6 Merge branch 'dev' into payments-new ...

Conflicts:
	.gitignore
	app/models/ability.rb
	app/models/member.rb
	db/schema.rb

2013-06-04 19:42:00 +10:00

..

deploy

More tweaks to get staging working

2012-10-06 21:48:59 +01:00

environments

Vendored the activemerchant gem to help with testing

2013-05-31 12:15:23 +10:00

initializers

Escaped_Markdown HAML filter, for use in RSS.

2013-05-16 15:08:50 +01:00

locales

Made the password reset email friendlier.

2013-03-26 19:26:29 +11:00

application.rb

Display posts in summary on forum page

2013-02-14 13:35:23 +11:00

boot.rb

Moving development to top level directory

2012-08-23 10:41:00 -07:00

compass.rb

i think i've got foundation working. maybe.

2012-09-15 11:12:04 +01:00

database.yml

and the database config

2012-10-06 21:52:40 +01:00

deploy.rb

missed a comma

2012-10-06 21:37:14 +01:00

environment.rb

Moving development to top level directory

2012-08-23 10:41:00 -07:00

newrelic.yml

setting up NewRelic for performance monitoring

2013-03-19 15:22:59 +11:00

routes.rb

Merge branch 'dev' into payments-new

2013-06-04 19:42:00 +10:00

setup_load_paths.rb

removing line i previously commented out at passenger's suggestion

2012-09-12 09:48:39 +01:00

unicorn.rb

Use unicorn for concurrency on heroku

2013-03-19 14:10:06 +11:00