Luis Ramos 19da0ba969 Merge branch 'master' into 3-0-stable-may13

2020-05-13 19:50:32 +01:00

..

environments

Merge branch 'master' into 3-0-stable-may-5

2020-05-05 19:11:20 +01:00

initializers

Merge branch 'master' into 3-0-stable-Apr28

2020-04-28 13:40:19 +01:00

locales

Change join word between the two filter sets to be "and", to match the actual logic

2020-05-10 09:44:12 +02:00

routes

Merge branch 'master' into 3-0-stable-may-5

2020-05-05 19:11:20 +01:00

application.rb

Merge branch 'master' into 3-0-stable-mar6

2020-03-06 09:20:03 +00:00

application.yml.example

Merge branch 'master' into 3-0-stable-apr3

2020-04-03 18:26:26 +01:00

boot.rb

new rails 3.1.4 app

2012-03-27 10:10:26 +11:00

database.yml

Allow changing the connection pool size

2020-04-06 16:03:06 +02:00

environment.rb

Use require_relative introduced in Ruby 1.9.2

2016-07-20 16:07:35 +10:00

newrelic.yml.example

Add config/newrelic.yml.example for newrelic_rpm gem

2019-04-12 13:57:50 +08:00

ng-test.conf.js

Make dockerfile install node and adapt karma browser config to work inside a docker container

2020-04-27 19:05:11 +01:00

routes.rb

Merge branch 'master' into 3-0-stable-may13

2020-05-13 19:50:32 +01:00

schedule.rb

Make whenever properly read the S3 bucket

2019-12-09 17:16:11 +01:00

spree.yml

spree install.

2012-03-27 11:06:49 +11:00