Skud a79a8dc927 Merge branch 'dev' of https://github.com/Growstuff/growstuff into memberprofile ...

Conflicts:
	app/views/scientific_names/index.html.haml

2014-10-19 16:54:10 +01:00

..

deploy

More tweaks to get staging working

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

environments

merge in a bunch of (mostly bootstrap 3) changes

2014-08-29 07:14:44 +10:00

initializers

no longer raise exception on missing g translation in dev / test envs

2014-09-28 21:34:26 +10:00

locales

no longer raise exception on missing g translation in dev / test envs

2014-09-28 21:34:26 +10:00

application.rb

stop generating helpers, constroller specs, view specs, and javascripts

2014-09-28 21:57:05 +10:00

application.yml.example

Added note as to why mapbox config isn't in application.yml

2014-06-02 19:00:50 -05: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

One more try to get travis working with postgres

2014-07-06 21:34:23 +10: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

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

setting up NewRelic for performance monitoring

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

routes.rb

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

2014-10-19 16:54:10 +01: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