Merge Request #7

Merged
noosferogov/noosfero!7
Created by Carlos Purificação

Login captcha

Merge previous repository with staging

Assignee: None
Milestone: None

Merged by Victor Costa

Commits (9)
2 participants
  • 4a20548511a65cfccc863520b70c3ee9?s=40&d=identicon
    Victor Costa @vfcosta

    Added 1 new commit:

    • 847563a5 - Remove debug code
    Choose File ...   File name...
    Cancel
  • Me
    Michel Felipe started a discussion on commit 64f9b09c
    last updated by Michel Felipe
    test/unit/api/articles_test.rb
    154 154 post "/api/v1/articles/#{article.id}/vote?#{params.to_query}"
    155 155 json = JSON.parse(last_response.body)
    156 156 ## The api should not allow to save this vote
    157   - assert_equal false, json['vote']
      157 + assert_equal 400, last_response.status
    1
    • Me
      Michel Felipe @mfdeveloper

      For this specific situation, maybe will be better check the model validation message returned by this request. What do you think about this?

      Choose File ...   File name...
      Cancel
  • 2c5c4299d62769e3da7d432cd2823dd6?s=40&d=identicon
    Carlos Purificação @carloseugenio

    I think this check is for the API vote function itself, not the model validation messages. Model validation messages should be on the model/active-record level tests. All other tests on this file don't check model validation messages.

    Choose File ...   File name...
    Cancel
  • 4a20548511a65cfccc863520b70c3ee9?s=40&d=identicon
    Victor Costa @vfcosta

    Added 2 new commits:

    Choose File ...   File name...
    Cancel
  • 4a20548511a65cfccc863520b70c3ee9?s=40&d=identicon
    Victor Costa @vfcosta

    Added 329 new commits:

    • c24579c4 - Update pairwise plugin
    • 0881f908 - remove feedback hardcoded code
    • c8fa463d - Update proposals_discussion plugin
    • 2dd9c858 - Merge branch 'master' into staging_rails4
    • d7466e4e - updating pairwise plugin
    • a3d12f0e - Merge branch 'master' into staging_rails4
    • 0e771dc8 - updating juventude plugin
    • 92fbfd94 - Merge branch 'master_rails4' into staging
    • 56f3aee2 - api: better support to choose returned fields
    • a3937f82 - Fix task mailer tests
    • ba59eba6 - api: fix search tests
    • a150d075 - responsive: don't fetch user again
    • 4b98e236 - Add slim: fatest and prettiest templates for rails
    • b1f028a2 - Remove slim gem on plugins as it is now on core
    • 825af879 - AddMemberTest: fix call to unexisting assertion method
    • 56b62930 - avoid sanitizer to encode special chars
    • 1ed857fe - api/search_test: remove extra whitespace
    • fe3b003a - api/search_test: fix flaky test
    • ecf8756f - test/unit/person_notifier_test: state expected exception type
    • 5cc78b4e - rails4: fixes call to deprecated assertion method
    • 95fdfbab - Add custom field feature to core
    • 741e19ae - Include some profile controller paths to show breadcrumbs block
    • c208417a - Fix how the duration of events are calculated
    • b730dafd - event: Fix past/future class on events
    • 093d5f22 - event: fix tests related to duration of event
    • 6fbe381c - util/debian-install: fix installing wheezy
    • acc7b3c9 - lib/noosfero.rb: remove unecessary require statement
    • 4c2a32d5 - comment_paragraph: fix sanitizer initialization (fix tests)
    • 0e4173fa - environment_notification: shorten index name (fix migration)
    • b512c204 - rails4: mv assert_not_include{,s}
    • 177dbc52 - rspec3: migrate be_true and be_false
    • 58ea4796 - Update delivery, orders, orders_cycle, suppliers and shopping_cart to rails4
    • 8bb7b83a - rspec3: enable deprecated should syntax
    • 8f8f1ad6 - Fix tasks controller tests
    • d26eed6e - Merge branch 'staging' into staging_rails4
    • 44c5519f - Merge branch 'master' into staging_rails4
    • 9c7cf5bc - Fix merge
    • 71129f10 - Fix merge
    • b47cc350 - Fix processed tasks action in task controller
    • 6f721222 - Update plugins
    • 633b9c2c - Merge branch 'master' into staging_rails4
    • 8a124641 - Merge branch 'staging' into staging_rails4
    • a74b5d28 - Update gemfile lock
    • 7041451b - Merge branch 'master' into staging_rails4
    • 8ea48a2e - Merge branch 'staging_rails4' of softwarepublico.gov.br:noosferogov/noosfero into staging_rails4
    • e1bd8b85 - update dialoga plugin
    • 65067c74 - fix oauth_provider plugin adding responders dependency for doorkeeper works properly
    • 749483e4 - Merge branch 'staging_rails4' of softwarepublico.gov.br:noosferogov/noosfero into staging_rails4
    • 0bf25818 - Merge branch 'pg_search_rank' into staging_rails4
    • 84dadd4c - Merge branch 'staging_rails4' of softwarepublico.gov.br:noosferogov/noosfero into staging_rails4
    • 1a54fba2 - updating pairwise plugin
    • 1279aed8 - Merge branch 'staging_rails4' of softwarepublico.gov.br:noosferogov/noosfero into staging_rails4
    • bf4e1cf1 - Merge branch 'master' into staging_rails4
    • 28c2e26c - Merge branch 'master' into staging_rails4
    • a45fc54a - Merge branch 'staging' into staging_rails4
    • fa3b8c7e - Merge branch 'master' into staging_rails4
    • da74e1bc - Update pairwise plugin
    • 176dd8f2 - Merge branch 'staging' into staging_rails4
    • 5289739f - ldap: fix gemfile
    • 73bba38f - Merge branch 'master' into staging_rails4
    • 0adad011 - Remove hardcoded piwik code from application layout
    • 13870552 - Revert "return distinct elements in by_enterprise scope"
    • 9994dedf - refactoring assert_equivalent to compare arrays properly
    • ec60dac8 - require_auth_to_comment: fix exception protected method logged_in?
    • dbaa5364 - Merge branch 'require_auth_to_comment_fix' into 'master'
    • 71178d9a - Noosfero::VERSION: avoid git warning on shallow clones
    • b867d614 - script/vagrant: extract APT proxy setup
    • 2ea43bfd - Add Dockerfile to build Debian Jessie CI image
    • 13eeb12b - .gitlab-ci.yml: use published docker image
    • 7bac1b27 - set-apt-proxy: fix script permissions
    • aaa3f4fe - ldap: add gemfile source
    • 8571cfc9 - Fix Stoa daemon paths and script name variables
    • 1d20b6f8 - Merge branch 'stoa-daemon' into 'master'
    • b256dff9 - ldap: accept multiple fields in login attribute
    • 0c7ed580 - Organization Ratings plugin improvements
    • ce49e588 - ldap: refactor authentication method
    • 492d8b25 - Translated using Weblate (Spanish)
    • 7be7e7c6 - Add custom field feature to core
    • 84ca7256 - Merge branch 'customfields-rails4' into 'master'
    • 5b9ea251 - Include some profile controller paths to show breadcrumbs block
    • 1a57fd09 - Merge branch 'increase_breadcrumbs_reach' into 'master'
    • 0bd3c635 - update db/schema.rb
    • 7f19dfe8 - Fix how the duration of events are calculated
    • 73a643ce - Merge branch 'event_duration' into 'master'
    • 36f1b7bc - event: Fix past/future class on events
    • 0d4fa8fa - Merge branch 'event_time' into 'master'
    • c153ab2b - event: fix tests related to duration of event
    • f2f58313 - util/debian-install: fix installing wheezy
    • 1309d67f - lib/noosfero.rb: remove unecessary require statement
    • 81ecee71 - comment_paragraph: fix sanitizer initialization (fix tests)
    • 3d1c948f - environment_notification: shorten index name (fix migration)
    • dc161eb7 - rails4: mv assert_not_include{,s}
    • 0f263193 - rspec3: migrate be_true and be_false
    • d663bb67 - Update delivery, orders, orders_cycle, suppliers and shopping_cart to rails4
    • d0c953ce - rspec3: enable deprecated should syntax
    • 9049f9e3 - organization-ratings: add hotspot for rating creation
    • ab48799c - cucumber: remove deprecation warnings from test logs
    • e74f65a7 - Merge branch 'next'
    • fd06f939 - adapting tests to use nokogiri correctly
    • 02b68349 - rails4: rename attachment_fu folder to the name of the gem
    • ddb1fffe - rails4: remove will_paginate from vendor/plugins as it is already load externally
    • 193d5352 - rails4: rename vote_fu to the name of its gem
    • 422b350a - rails4: rename contacts, gdata and ezcrypto to theis gems names
    • 21810adf - rails4: require missing dependencies
    • 922b8c6f - rails4: add needed gemspecs for gem dependency track
    • 8ca818fa - rails4: upgrade dependencies to rails4
    • 4fca4d2b - rails4: use secret_key_base
    • 380faf7e - rails4: upgrade initialization
    • fe697067 - rails4: upgrade routes
    • 0346bd58 - rails4: migrate set_table_name
    • cffc52de - rails4: fix regexp security error
    • 0fb9f587 - rails4.1: renamed reserved keyword
    • 62987843 - rails4.1: allow use of roles
    • 47b2e79b - rails4.1: remove configuration not supported
    • 3ffe1796 - rails4.1: temporaraly removed :finder_sql as it is not supported anymore
    • cce95085 - rails4.1: upgrade will_paginate, delayed_job and attachment_fu
    • a3ed4c95 - rails4: Use latest version from 4.1 series
    • 376bf478 - rails4: update eita-jrails
    • 61707cce - rails4: Default locale to en if not set
    • f231e19b - rails4: fix person/save infinite loop
    • 8925ef9a - rails4: Select RMagick processor for attachment_fu
    • 03c4d8cf - rails4: fix array sum for paths
    • 89b38599 - rails4: convert to string
    • 77c8eca9 - rails4: fix mass assignment on delayed_job
    • 816d1df6 - rails4: 'from' scope is reserved on rails4
    • a1dad6ba - rails4: replace :conditions by where
    • edb090f0 - rails4: update to rails 4.2
    • b56a45db - rails4: reject! don't work with relation
    • 5e5f1478 - rails4: replace includes with joins to fix query error
    • c9fefc28 - rails4: fix unitinialized constant Test
    • b4e6aa3b - rails4: assert_block was deprecated
    • a294f41d - rails4.2: migrate type casting as acts_as_having_settings
    • b84e8fa8 - rails4: from Task.find_by_code to scope
    • 3decb46d - rails4: fix tests init
    • a7264f26 - rails4: remove deprecated application controller file
    • 5a265683 - rails4: use Noosfero::Mailer to set required default_url_options
    • c9e6851d - rails4: do not assert ActiveRecord::Relation as rails changes it
    • 9b404dbe - rails4: disable autosave on person association
    • c6d40a34 - rails4: Array is not used for AR results
    • 9b8228e7 - rails4: use ApplicationMailer pattern
    • 20560074 - rails4: fix identifier regexp
    • d1246cba - rails4: add missed param
    • b5ca63ab - rails4: fix profile tests
    • 31b28c41 - rails4: fix articles versions' tests
    • db650139 - rails4: use new rails sanitizer (loofah)
    • 92267854 - rails4: fix user tests
    • 5d783a7e - rails4: check tag content
    • 2f568c12 - rails4: port comments on action_tracker
    • a3c6b602 - rails4: fix uploaded file tests
    • 6e6793d8 - rails4: only load minitest on test and use minitest-reporters
    • 80fe1db0 - rails4: simplify and fix find_tag_in_string
    • e1f5836f - rails4: use latest rails
    • 7cb73057 - rails4: fix rake db:schema:load run
    • 3c57da65 - rails4: fix a bunch of unit tests
    • 2cee8f57 - rails4: fix more unit tests
    • 1cc34ff8 - rails4: fix all unit tests
    • fafb323e - rails4: fix most functional tests
    • 0e75f1c2 - rails4: fix remaining funcionals tests
    • 7e00c87c - rails4: fix integration tests
    • 6ee575f1 - rails4: fix init (upgrade cucumber) and fix some scenarios
    • bcf8f080 - rails4: update jquery-ujs' rails.js
    • 5281ccda - rails4: fix remaining cucumber tests
    • 1ea6b1cb - rails4: change require on tests
    • f1b53f69 - rails4: fix migration errors with Noosfero::Plugin::ActiveRecord
    • eb8d2df0 - rails4: use new sanitizer
    • 71b019f0 - rails4: put default primary key and convert Rails.root.join for gsub
    • e045c942 - rails4: fix foundation_year validation
    • e6c893a2 - rails4: changed missed set_table_name
    • ecc9032a - rails4: removed unused rakismet from vendor
    • 6b366ef4 - rails4: move to is_public scope
    • f8dbcc7c - rails4: use data-confirm to work with new rails.js
    • caf7b511 - rails4: update attachment_fu and remove monkey patch
    • e3bb9147 - rails4: fix count with distinct monkey patch
    • 92d8b7be - rails4: fix asset pipeline use
    • d6340a14 - rails4: fix plugins tests
    • 5cc216ef - Merge branch 'noosfero' into rails4
    • 97ae8d25 - rails4: port to new session_store
    • a3bfec81 - rails4: workaround user load
    • f3ac17d4 - rails4: fix broken tests after merge
    • c686ddb2 - Merge branch 'noosfero' into rails4
    • b9d2cc07 - rails4: update to 4.2.4
    • 8548bd8a - rails4: fix units and plugins tests
    • b93de569 - travis: use ruby 2.2.3
    • 1e78417c - rails4: fix remaining unit and functionals tests
    • 3ce06577 - rails4: fix layout disable
    • 525cc340 - rails4: fix randomly failing person_notifier test
    • 92def34a - rails4: fix selenium tests
    • c5a6b574 - responsive: use prepend only on ruby 2.0.0+
    • 64eda093 - rails4: fix tests on edge cases
    • 4352c377 - rails4: stick with ruby 1.9 for lambda syntax bug
    • ee8fd9e4 - Merge branch 'noosfero' into rails4
    • 6e62a1c1 - rails4: fix support for ruby 1.9
    • 4b24bb17 - Merge branch 'noosfero' into rails4
    • 274d9644 - rails4: add missed spring-commands-testunit
    • fe8fe114 - rails4,api: fix requires
    • 810bfe8c - rails4: use lambda syntax compatible with ruby 1.9 and 2.0
    • 65264159 - rails4: back to testing on ruby 2 as it is way faster
    • 69d5f48c - rails4: use eager_load by default (fix api tests)
    • df51a028 - rails4: set current user on approve_article tests
    • 190f639e - travis: fix ruby version
    • ab2d95ff - rails4: simbolize keys on full hash assign
    • b3d6f944 - rails4: fix asset pipeline use
    • 0bb637b2 - rails4: rename remaining old named_scope
    • 41f821e8 - rails4: fix more redirect_to params error
    • b71858da - rails4: remove silencers from backtrace_cleaner
    • d486c3ff - rails4: replace update_attributes with the new update
    • a13bb596 - rails4: force html rendering for 403/404
    • 8bc107b4 - rails4: correctly handle api errors
    • 3ce46bb6 - Merge branch 'noosfero' into rails4
    • 36f9dc48 - articles: be specific in queries
    • 809ba7e6 - rails4: move hash key to symbol
    • c50ccd6e - Merge branch 'noosfero' into rails4
    • 6d8fd953 - rails4: fix login invalidation
    • d3c1bfbb - rails4: fix cucumber deprecation warnings
    • df84cdf6 - rails4: make login possible without touching user_data
    • 21a97a65 - delayed_job: config logger
    • 10e7ec44 - rails4: fix size to nil instead empty string (do not use to_s)
    • cbd6f636 - rails4: fix functionals test after merge
    • 4b28211e - rails4: fix a case where partial_for_class is not working for plugins
    • 01937f3d - rails4: relax some dependency constraints
    • a8b43e69 - Gemfile: drop versioned dependency on cucumber
    • b25546b4 - travis-ci: comment makemo until new gettext's api is used
    • f09b8e4e - Merge branch 'master' of https://gitlab.com/noosfero/noosfero into rails4
    • cec323ee - Merge branch 'master' of https://gitlab.com/noosfero/noosfero into rails4
    • 36a91335 - Merge branch 'noosfero' into rails4
    • 1b6f9e37 - Merge branch 'noosfero' into rails4
    • c9c81cfa - rails4: apply associations extensions to child classes
    • d4733489 - Add memberships association for eager loading
    • e8fa0f50 - rails4: Remove activecord primary_key monkey patch
    • c9ce5315 - rails: use a Debian Jessie vagrant box by default
    • 7fcc2cb0 - Add script to install dependencies on Debian Jessie
    • 0e6cd29a - rails4: relax dependencies for Debian Jessie
    • cc3a302d - Remove embedded copy of diffy
    • b2104972 - rails4: Gemfile adjustments
    • 63963974 - rails4: update debian package dependencies
    • f7761e0d - Merge branch 'master' into rails4
    • d7ee1f55 - rails4: don't force a sass version
    • 2c34db5f - Merge remote-tracking branch 'origin/master' into rails4
    • 10aff692 - rails4: go back to rails 4.2
    • 5ebd5e2c - Merge remote-tracking branch 'origin/master' into rails4
    • 74f1ee68 - rails4: port translation tasks to Ruby-GetText 3.x
    • 8376889f - noosfero:translations:compile: avoid change to PO files
    • 5d6f2e08 - noosfero:translations:compile: look for PO files in the right place
    • de53d9cf - plugins/analytics: removing empty POT file
    • d72d5de2 - quick-start: also create test database
    • 678f0e26 - Merge branch 'master' into rails4
    • f9a04729 - rails4: fix asset pipeline
    • a700537c - Merge branch 'rails4'
    • 2dd3d36d - script/development: always send unicorn to the background
    • 359f5d1c - plugins: don't abort on failure of a single plugin
    • e372474d - Restore behavior of the default rake task
    • aece445a - gitignore.example: ignore a local initializer file
    • bf2cbbd3 - Fix behaviour of rake
    • 348b6cb5 - Fixes whenever in production for a multitenancy setup
    • 8c698880 - Merge branch 'whenever-multitenancy' into 'master'
    • 0a886b64 - drop test:rcov task
    • 90a9d312 - Move ci run to script/ci
    • 39a64217 - Remove bogus duplicated code
    • c1bebd4c - Move grape_routes task to its own file
    • 139ef7fe - added 'restricted' mode to tinymce
    • efd5f974 - environment_notification: mv css to public folder
    • d03350b9 - organization_ratings: move css to public folder
    • 45e0d0bc - script/ci: ease search for specific tasks in log
    • 5641033f - Fix name of selenium rake task file
    • 4075f24d - newsletter: whitelist only text for article in newsletter
    • dcddcdea - newsletter: makes gap between tasks border and newsletter border smaller
    • ef77a138 - Merge branch 'newsletter-article-image' into 'master'
    • 82855c6a - dockerfile: update debian image to jessie
    • 0ba03df6 - newsletter: Fixes index creation in migration
    • 6aa8737e - Remove obsolete symlink added by old versions
    • 13fd87d5 - rails4: removes remaining Noosfero::Plugin::ActiveRecord
    • b164af65 - API improvements:
    • 0ac23124 - api: fixes to merge api to rails 4
    • 1e537056 - add test for user api
    • 67589517 - Fix cache_key expiration on image uploaded in articles
    • bd70a538 - Merge branch 'fix_image_cache_key' into 'master'
    • 42b3475d - Merge branch 'master' of gitlab.com:noosfero/noosfero
    • 663c7bac - removing unsed test file
    • 9e8b2738 - Move non-responsive styles from application.css to base theme
    • 48ca8357 - Merge branch 'move-non-responsive-styles' into 'master'
    • 9f1aafae - Support jruby
    • 10e08553 - Remove invalid submodule
    • 29e95ea9 - responsive: don't fetch user again
    • 689be119 - Add slim: fatest and prettiest templates for rails
    • 66f63aa8 - Remove slim gem on plugins as it is now on core
    • de606257 - AddMemberTest: fix call to unexisting assertion method
    • 71a1ced2 - avoid sanitizer to encode special chars
    • 4511d505 - Merge branch 'fix-html-sanitizer'
    • 947bf54c - db/schema.rb: update to Rails 4 conventions
    • 5962c438 - api/search_test: remove extra whitespace
    • c48a83f6 - api/search_test: fix flaky test
    • cf8721e9 - test/unit/person_notifier_test: state expected exception type
    • 75f13387 - rails4: fixes call to deprecated assertion method
    • d1261c16 - newsletter: Fix moderation checkbox regex
    • 674b489a - newsletter: Removes header padding in moderation page
    • ea09f868 - sniffer: rails4 fix filtering of virtual attribute distance
    • 57c595aa - newsletter: Fix test helper import
    • 0ee683a4 - Merge branch 'plugin-bug-fixes' into 'master'
    • e65387e7 - 0-downtime upgrades with the Debian package
    • d3b2dfce - Fix calendar of events for dates with time zone
    • 0767edbc - Merge remote-tracking branch 'origin/master'
    • 614b0d24 - ApplicationControllerTest: adapt multitenancy test
    • d4df1561 - ProfileControllerTest: fix pagination test
    • dc115f26 - Adjust multitenancy test for different PostgreSQL versions
    • 9ff5859c - Upgrade varnish configuration to Varnish 4
    • 875d8afc - Fix HTTP caching and logins with rails 4
    • 6d69da64 - Merge branch 'fix-http-cache' into 'master'
    • e85482ea - organization_ratings: fix migration
    • d378acea - shopping_cart: fix selenium tests
    • 6a2769a5 - assert_equivalent must have the same number of elements
    • 0e6a068c - should not return a theme twice
    • 6ea50685 - Merge branch 'fix_equivalent' into 'master'
    • 3057b70b - return distinct elements in by_enterprise scope
    • 370e1d19 - Enable bigger profile image on members list
    • c2223bbc - Merge branch 'change_members_image_size' into 'master'
    • 3bdce461 - piwik: allow custom path for url
    • 6e048943 - Merge branch 'master' into staging_rails4
    • ba70edb6 - Update proposals_discussion plugin
    • 643884a9 - Fix merge
    • 2f6a334d - api: paginate article search
    • 67ed6ad5 - Update proposals discussion plugin
    • e09406fd - adding insight submodule plugin
    • 302b8afb - Merge branch 'staging' of softwarepublico.gov.br:noosferogov/noosfero into staging
    • 8f432858 - Merge branch 'staging' of softwarepublico.gov.br:noosferogov/noosfero into staging
    • 788ad817 - Merge branch 'staging' of softwarepublico.gov.br:noosferogov/noosfero into staging
    • b698d268 - Update proposals_discussion plugin
    • c58ea4db - Update proposals_discussion plugin
    • eaa94bb4 - Add ruby version conf
    • 553a5c2f - Merge branch 'staging' into login-captcha
    Choose File ...   File name...
    Cancel
  • 4a20548511a65cfccc863520b70c3ee9?s=40&d=identicon
    Victor Costa @vfcosta
    Choose File ...   File name...
    Cancel