Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'pkg' into develop

Browse source
This commit is contained in:
Martin Edenhofer 2016-10-19 06:25:07 +02:00
commit 1e719f9274
2 changed files with 2 additions and 998 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

993
.gitlab-ci.yml
View file

File diff suppressed because it is too large Load diff

7
.pkgr.yml
View file

@ -17,11 +17,8 @@ before:
- ruby -v - ruby -v
- env - env
- cp config/database.yml.pkgr config/database.yml - cp config/database.yml.pkgr config/database.yml
- echo "gem 'pg'" >> Gemfile.local - echo "gem 'mysql2'" >> Gemfile.local
- echo "gem 'mysql2', '~> 0.3.20'" >> Gemfile.local - "cat Gemfile.lock"
- sed -i "s/specs:/specs:\\n pg (0.18.4)/g" Gemfile.lock
- sed -i "s/DEPENDENCIES/DEPENDENCIES\\n pg/g" Gemfile.lock
- "#cat Gemfile.lock"
- contrib/cleanup.sh - contrib/cleanup.sh
env: env: