[Git][noosfero/noosfero][master] 2 commits: Revert "elasticsearch: try fix"

[Bráulio Bhavamitra]

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


Commits:
9fb3fb64 by Braulio Bhavamitra at 2017-04-25T17:56:37-03:00
Revert "elasticsearch: try fix"

This reverts commit 3a1cef85db3c980a78f1061c10d59f9eb5b12087.

- - - - -
07ce1dae by Braulio Bhavamitra at 2017-04-25T17:56:48-03:00
Revert "travis tmp"

This reverts commit 357cd93be89b8da9ff6b51ec7ac8cd968e8afee0.

- - - - -


2 changed files:

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


Changes:

=====================================
.travis.yml
=====================================
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,7 +56,21 @@ 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,7 +16,6 @@ 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/3a1cef85db3c980a78f1061c10d59f9eb5b12087...07ce1daed6fb8096416c8045f24356f13ced9f9a

---
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/3a1cef85db3c980a78f1061c10d59f9eb5b12087...07ce1daed6fb8096416c8045f24356f13ced9f9a
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/ec2c4d29/attachment-0001.html>