Brenda Wallace 13e8d1f5a5 Merge remote-tracking branch 'upstream/dev' into api

2017-11-17 21:51:39 +13:00

..

environments

Dev is almost always on port 3000

2017-10-28 10:38:51 +13:00

initializers

Add a default paginator for api responses

2017-11-13 19:19:18 +13:00

locales

…

application.rb

…

application.yml.example

…

boot.rb

…

compass.rb

…

database.yml

…

database.yml.example

…

environment.rb

…

factory_bot.rb

Factorygirl to factorybot - fixes #1413 (#1425)

2017-11-01 15:03:31 +00:00

i18n-tasks.yml

…

newrelic.yml

…

robots.staging.txt

…

robots.txt

…

routes.rb

Added seeds and harvests to api, and tidied up resources

2017-11-13 19:19:18 +13:00

secrets.yml

…

setup_load_paths.rb

…

sidekiq.yml

…

unicorn.rb

Underscore prefix on our last unused args (#1442)

2017-11-13 09:54:55 +00:00