[Git][noosfero/noosfero][master] 2 commits: travis: remove workaround and fix selenium concurrent run

[Bráulio Bhavamitra]

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


Commits:
33eb3f78 by Braulio Bhavamitra at 2015-07-19T20:49:13Z
travis: remove workaround and fix selenium concurrent run

- - - - -
1a1eab27 by Braulio Bhavamitra at 2015-07-19T20:49:14Z
sub_organizations: add missed timestamps (fix unit tests)

- - - - -


2 changed files:

- .travis.yml
- plugins/sub_organizations/db/migrate/20150508153119_add_timestamp_to_relation.rb


Changes:

=====================================
.travis.yml
=====================================
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,13 +19,6 @@ addons:
       - libsqlite3-dev
       - libxslt1-dev
 
-before_install:
-# FIXME: workaround while https://github.com/travis-ci/travis-ci/issues/4210 is open
-  - rm config/initializers/default_icon_theme.rb
-# selenium support
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
-
 before_script:
   - mkdir -p tmp/pids log
   - bundle check || bundle install


=====================================
plugins/sub_organizations/db/migrate/20150508153119_add_timestamp_to_relation.rb
=====================================
--- a/plugins/sub_organizations/db/migrate/20150508153119_add_timestamp_to_relation.rb
+++ b/plugins/sub_organizations/db/migrate/20150508153119_add_timestamp_to_relation.rb
@@ -2,5 +2,7 @@ class AddTimestampToRelation < ActiveRecord::Migration
   def change
     add_column :sub_organizations_plugin_relations, :created_at, :datetime
     add_column :sub_organizations_plugin_relations, :updated_at, :datetime
+    add_column :sub_organizations_plugin_approve_paternity_relations, :created_at, :datetime
+    add_column :sub_organizations_plugin_approve_paternity_relations, :updated_at, :datetime
   end
 end



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/549bf1dc1623087ddceb3b42a6dd12be71f5dcc6...1a1eab27432e2839c9eb33b0cc1dd5a9ac047d42
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150719/9a146d88/attachment.html>