[noosfero/noosfero][master] 5 commits: Merge branch 'participa/noosfero-vote_infra'

[Leandro Nunes]

Leandro Nunes pushed to branch master at Noosfero / noosfero


Commits:
5b13e75c by Leandro Nunes dos Santos at 2015-06-02T12:01:00Z
Merge branch 'participa/noosfero-vote_infra'

- - - - -
076e26f5 by Leandro Nunes dos Santos at 2015-06-02T13:57:05Z
Merge branch 'master' of gitlab.com:noosfero/noosfero

- - - - -
2a69ff00 by Leandro Nunes dos Santos at 2015-06-02T16:02:57Z
Merge branch 'master' of gitlab.com:noosfero/noosfero

- - - - -
a5e7b017 by Leandro Nunes dos Santos at 2015-06-02T20:35:39Z
Merge branch 'master' of gitlab.com:noosfero/noosfero

- - - - -
b4000b01 by Leandro Nunes dos Santos at 2015-06-02T21:00:41Z
undo wrong require path

- - - - -


1 changed file:

- vendor/plugins/monkey_patches/init.rb


Changes:

=====================================
vendor/plugins/monkey_patches/init.rb
=====================================
--- a/vendor/plugins/monkey_patches/init.rb
+++ b/vendor/plugins/monkey_patches/init.rb
@@ -1,3 +1,3 @@
-require_relative 'attachment_fu_validates_attachment/init'
-require_relative 'attachment_fu/init'
-require_relative 'white_list_sanitizer_unescape_before_reescape/init'
+require File.join(File.dirname(__FILE__), 'attachment_fu_validates_attachment/init')
+require File.join(File.dirname(__FILE__), 'attachment_fu/init')
+require File.join(File.dirname(__FILE__), 'white_list_sanitizer_unescape_before_reescape/init')



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/bdaf45c2917613b64fbdd5ecb0458cfe3078cdbc...b4000b019a691d08b639fcf8ccbe5bd866bada05
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150603/fc16719c/attachment.html>