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

Resolved merge conflict.

Browse source
This commit is contained in:
Martin Edenhofer 2018-07-19 19:19:30 +02:00
parent 86c79c3dba
commit d2d6fa981c
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -240,7 +240,6 @@ test:integration:es_mysql:
- export ES_URL="http://localhost:9200"
- rake db:create
- rake db:migrate
- ruby -I test/ test/integration/elasticsearch_active_test.rb
- ruby -I test/ test/integration/elasticsearch_test.rb
- ruby -I test/ test/controllers/search_controller_test.rb
- ruby -I test/ test/integration/report_test.rb
@ -260,7 +259,6 @@ test:integration:es_postgresql:
- export ES_URL="http://localhost:9200"
- rake db:create
- rake db:migrate
- ruby -I test/ test/integration/elasticsearch_active_test.rb
- ruby -I test/ test/integration/elasticsearch_test.rb
- ruby -I test/ test/controllers/search_controller_test.rb
- ruby -I test/ test/integration/report_test.rb