14 May, 2014
12 commits
-
Change made by AI2610 (f1dd48d)
-
This include was causing cucumber to crash because it was overwriting the "tag" method on top-level, causing gherkin to jump awkwardly to action_view. More information about this problem here: https://github.com/cucumber/gherkin/issues/76
13 May, 2014
18 commits
-
http://makandracards.com/makandra/14725-instance_eval-behaves-different-in-ruby-1-8-and-ruby-1-9-use-instance_exec-instead
-
Testing the difference of the exact job instead of all jobs. Also including class methods on Delayed::Job to fetch jobs by_handler and with handler_like (using sql LIKE).
-
Conflicts: app/helpers/application_helper.rb app/helpers/layout_helper.rb app/models/community.rb app/models/enterprise.rb app/models/product_category.rb app/views/account/change_password.html.erb config/boot.rb config/environment.rb config/routes.rb lib/noosfero/plugin.rb test/unit/enterprise_activation_test.rb test/unit/person_notifier_test.rb
12 May, 2014
10 commits
-
Also removing local jquery-ui themes and using themes provided by cdn instead.
-
Conflicts: app/views/layouts/_javascript.html.erb public/javascripts/jquery-latest.js
-
* 'rails3' of gitlab.com:noosfero/noosfero: Fix escaping in blog post authorship info
-
Conflicts: features/categories_block.feature public/stylesheets/application.css
