Merge branch 'master' of github.com:internetee/registry

This commit is contained in:
Martin Lensment 2014-10-20 11:13:10 +03:00
commit bc97d0ca5f
3 changed files with 6 additions and 6 deletions

View file

@ -3,11 +3,6 @@
# Update repo # Update repo
# #
# default locations
export LANGUAGE=en_US.UTF-8
export LANG=en_US.UTF-8
export LC_ALL=en_US.UTF-8
# cd to Rails root directory # cd to Rails root directory
cd "$(dirname "$0")"; cd .. cd "$(dirname "$0")"; cd ..

View file

@ -6,6 +6,12 @@
# fail later # fail later
set -o pipefail set -o pipefail
# default locations
export LANGUAGE=en_US.UTF-8
export LANG=en_US.UTF-8
export LC_ALL=en_US.UTF-8
export RAILS_ENV=test
# cp config/secrets-example.yml config/secrets.yml # cp config/secrets-example.yml config/secrets.yml
# create manually config/database.yml # create manually config/database.yml

View file

@ -14,7 +14,6 @@ module General
end end
end end
RSpec.configure do |c| RSpec.configure do |c|
c.include General c.include General
end end