[Git][noosfero/noosfero][master] 2 commits: travis tmp

[Bráulio Bhavamitra]

Bráulio Bhavamitra pushed to branch master at Noosfero / noosfero


Commits:
357cd93b by Braulio Bhavamitra at 2017-04-25T16:51:39-03:00
travis tmp

- - - - -
3a1cef85 by Braulio Bhavamitra at 2017-04-25T17:06:41-03:00
elasticsearch: try fix

- - - - -


2 changed files:

- .travis.yml
- plugins/elasticsearch/lib/searchable_model/elasticsearch_indexed_model.rb


Changes:

=====================================
.travis.yml
=====================================
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,21 +56,7 @@ env:
   global:
     - LANG=en
   matrix:
-    - TASK=test:api
-    - TASK=test:units
-    - TASK=test:functionals
-    - TASK=test:integration
-    - SLICE=1/2 TASK=cucumber
-    - SLICE=2/2 TASK=cucumber
-    - SLICE=1/4 TASK=selenium
-    - SLICE=2/4 TASK=selenium
-    - SLICE=3/4 TASK=selenium
-    - SLICE=4/4 TASK=selenium
-    - SLICE=1/5 TASK=test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
     - SLICE=2/5 TASK=test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
-    - SLICE=3/5 TASK=test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
-    - SLICE=4/5 TASK=test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
-    - SLICE=5/5 TASK=test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
     # chrome hanging on travis
     #- SLICE=1/4 TASK=selenium SELENIUM_DRIVER=chrome
     #- SLICE=2/4 TASK=selenium SELENIUM_DRIVER=chrome


=====================================
plugins/elasticsearch/lib/searchable_model/elasticsearch_indexed_model.rb
=====================================
--- a/plugins/elasticsearch/lib/searchable_model/elasticsearch_indexed_model.rb
+++ b/plugins/elasticsearch/lib/searchable_model/elasticsearch_indexed_model.rb
@@ -16,6 +16,7 @@ module ElasticsearchIndexedModel
         mappings dynamic: 'false' do
           base.indexed_fields.each do |field, value|
             type = value[:type].presence
+            type = :string if type and type.to_sym == :text
 
             if type == :nested
               indexes(field, type: type) do



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/308dd4dfa1adbb08f1fecb60fce822c26b9a48e0...3a1cef85db3c980a78f1061c10d59f9eb5b12087

---
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/308dd4dfa1adbb08f1fecb60fce822c26b9a48e0...3a1cef85db3c980a78f1061c10d59f9eb5b12087
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20170425/5eac9788/attachment-0001.html>