Download as
Browse Code »

Commit 8ff84101607bfb6b44b222c415b2934b2a89a5c2

Authored by Leandro Santos
1 parent 9a82580e
Exists in staging and in 4 other branches captcha_serpro_plugin, login-captcha, production, production-vendorized

updating modules

Showing 3 changed files with 2 additions and 3 deletions   Show diff stats
plugins/proposals_discussion
  Diff comments   View file @8ff8410
1 -Subproject commit 1bd718a5f8a5268ca580dded82a6c5fc5b8480dd 1 +Subproject commit f9404f285440386c1e740c858e8bb0da405b656d
public/proposal-app
  Diff comments   View file @8ff8410
1 -Subproject commit af23f0110e0c6b4e38b871746128d399019dc3db 1 +Subproject commit 02d17d88a5b9fe2541193f9d8ea894c8627591dd
test/unit/api/articles_test.rb
  Diff comments   View file @8ff8410
@@ -442,7 +442,6 @@ class ArticlesTest < ActiveSupport::TestCase @@ -442,7 +442,6 @@ class ArticlesTest < ActiveSupport::TestCase
442 assert_equal user.person, Article.last.last_changed_by 442 assert_equal user.person, Article.last.last_changed_by
443 end 443 end
444 444
445 -<<<<<<< HEAD  
446 should 'vote for an article' do 445 should 'vote for an article' do
447 article = fast_create(Article, :profile_id => user.person.id, :name => "Some thing") 446 article = fast_create(Article, :profile_id => user.person.id, :name => "Some thing")
448 params[:value] = 1 447 params[:value] = 1