Brenda Wallace be67b858b4 Merge remote-tracking branch 'upstream/dev' into bw/long-lines-fixed ...

Conflicts:
	lib/tasks/growstuff.rake

2016-11-25 08:18:18 +13:00

..

environments

Removed extra blank lines, & added a end of file

2016-11-16 12:52:48 +13:00

initializers

Wrapped all long lines.

2016-11-17 22:02:18 +13:00

locales

Normalise translation file

2016-11-23 20:24:02 +13:00

application.rb

Removed extra blank lines, & added a end of file

2016-11-16 12:52:48 +13:00

application.yml.example

Merge branch 'dev' of github.com:Growstuff/growstuff into add_facebook_signup

2016-05-23 16:58:22 +09:30

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

Wrapped all long lines.

2016-11-17 22:02:18 +13:00

database.yml.example

Making database.yml locally editable

2016-05-22 15:50:22 +00:00

environment.rb

Moving development to top level directory

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

factory_girl.rb

Add config/factory_girl.rb so that rspec doesn't fail with a confusing

2016-05-25 17:35:57 -04:00

i18n-tasks.yml

don't scope routes to locale to make url prettier because it breaks tests like whoa

2014-09-18 07:14:35 +10:00

newrelic.yml

Removed all trailing white space

2016-11-14 15:05:32 +13:00

robots.staging.txt

Change the render to render the file directly

2015-05-04 23:37:40 -07:00

robots.txt

Change the render to render the file directly

2015-05-04 23:37:40 -07:00

routes.rb

Wrapped all long lines.

2016-11-17 22:02:18 +13:00

secrets.yml

Set staging secret key from environment

2015-07-09 00:47:11 +01:00

setup_load_paths.rb

removing line i previously commented out at passenger's suggestion

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

sidekiq.yml

Add sidekiq configuration

2016-08-16 11:02:35 +09:30

unicorn.rb

Use unicorn for concurrency on heroku

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