raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-19 04:49:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'i18n-replace-strings-in-js' into i18n

Browse Source 
Conflicts:
	.travis.yml
	app/views/spree/order_mailer/confirm_email_for_customer.html.haml
	config/locales/en.yml
This commit is contained in:
Maikel Linke
2015-10-21 14:09:43 +11:00
parent 6781051fe6 1751a95909
commit 2053fbecda
163 changed files with 2376 additions and 771 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
script/ci/run_tests.sh
View File

@@ -17,5 +17,8 @@ echo "--- Loading test database"
bundle exec rake db:drop db:create db:schema:load
bundle exec rake parallel:drop parallel:create parallel:load_schema
echo "--- Emptying cache"
bundle exec rake tmp:clear
echo "--- Running tests"
bundle exec rake parallel:spec