Permalink
Commits on Jul 22, 2016
  1. @tute

    Release version 2.4.0

    [ci skip]
    tute committed Jul 22, 2016
  2. @tute

    Test against Rails 5

    Drop unmaintained versions of Ruby and Rails from the CI build matrix.
    If you use those versions of Ruby and Rails, you can continue to use
    previously released version of merit.
    
    Upgrade Ambry dependency that works with Rails 5, with no XML
    Serializer.
    tute committed Jul 14, 2016
Commits on May 6, 2016
  1. @tute

    Release version 2.3.4

    [ci skip]
    tute committed May 6, 2016
  2. @bluciam @tute

    Check if PointRules exists during installation

    Updates NEWS.md
    
    [fixes #253]
    bluciam committed with tute May 1, 2016
Commits on Apr 28, 2016
  1. @tute

    Simplify merit's Travis CI build matrix

    Merit is not running tests on different ORMs, so we don't need that
    environmental variable.
    tute committed Apr 28, 2016
Commits on Apr 27, 2016
  1. @tute

    Merge pull request #251 from raderj89/master

    make model_name specification clearer
    tute committed Apr 27, 2016
  2. @raderj89

    Update README.md

    make `model_name` specification clearer
    raderj89 committed Apr 27, 2016
Commits on Mar 18, 2016
  1. @tute

    Merge pull request #247 from yakschuss/master

    Fixed stderr warnings
    tute committed Mar 18, 2016
Commits on Mar 17, 2016
  1. @yakschuss
Commits on Feb 25, 2016
  1. @tute

    Release version 2.3.3

    [ci skip]
    tute committed Feb 25, 2016
Commits on Feb 24, 2016
  1. @tute

    Merge pull request #243 from akamike/clarify_fields_migration

    Rename add/remove fields migrations to clarify intent
    tute committed Feb 24, 2016
Commits on Dec 3, 2015
  1. @akamike

    Rename add/remove fields migrations to clarify intent

    Adds a "merit" label to the add/remove fields migrations to make it move obvious what they are intended for, as "Add fields to X" is too generic in a real world application.
    akamike committed Dec 3, 2015
Commits on Jul 15, 2015
  1. @tute

    Merge pull request #232 from asharma-ror/patch-1

    update readme
    tute committed Jul 15, 2015
  2. @asharma-ror

    update readme

    indentation
    asharma-ror committed Jul 15, 2015
Commits on Apr 25, 2015
  1. @tute

    Add note on target inferring to README

    [fixes #212]
    tute committed Apr 25, 2015
  2. @tute

    Add validations to BadgesSash

    tute committed Apr 25, 2015
  3. @tute

    Merge pull request #215 from itsdan/master

    Accept only integers in add_badge
    
    Fixes bug in API where a `BadgeSash` would be created without failures
    with a nil `badge_id`.
    tute committed Apr 25, 2015
  4. @itsdn @tute

    Accept only integers in rm_badge

    itsdn committed with tute Mar 19, 2015
  5. @itsdn @tute

    Accept only integers in add_badge

    itsdn committed with tute Mar 19, 2015
Commits on Apr 21, 2015
  1. @tute

    gemspec update

    tute committed Apr 21, 2015
Commits on Apr 19, 2015
  1. @tute

    Release version 2.3.2

    Update NEWS.
    
    [ci skip]
    tute committed Apr 19, 2015
  2. @tute

    Merge pull request #221 from merit-gem/pr/220

    Update .travis.yml
    tute committed Apr 19, 2015
  3. @maclover7 @tute

    Update .travis.yml

    maclover7 committed with tute Mar 31, 2015
  4. @tute

    Update CONTRIBUTING and README documents

    [skip ci]
    tute committed Apr 19, 2015
Commits on Mar 28, 2015
  1. @tute

    Merge pull request #218 from CristianOliveiraDaRosa/master

    Implement I18n for internationalization support
    tute committed Mar 28, 2015
Commits on Mar 27, 2015
  1. @cristianoliveira

    Implement I18n for internationalization support

    cristianoliveira committed Mar 25, 2015
Commits on Mar 21, 2015
  1. @tute

    Add CONTRIBUTING document

    tute committed Mar 21, 2015
Commits on Feb 2, 2015
  1. @tute

    Merge pull request #211 from maratgaliev/array_first_element

    Use :first method instead of index
    tute committed Feb 2, 2015
Commits on Feb 1, 2015
  1. @maratgaliev

    Use :first method instead of index

    maratgaliev committed Feb 1, 2015
Commits on Jan 15, 2015
  1. @tute

    Release version 2.3.1.

    Update CHANGELOG.
    
    [ci skip]
    tute committed Jan 15, 2015
Commits on Jan 14, 2015
  1. @mdesantis @tute

    Sash creation bug fix

    When there's more than one rule pointing to the same action (let's say,
    a badge and a points rule), and when a target user with no prior
    reputation triggers both, two sashes are created, and part of the
    reputation was lost.
    
    Reloading the potentially just-created related sash before creating it
    solves this issue.
    
    [fixes #203] [fixes #204]
    mdesantis committed with tute Nov 28, 2014
Commits on Jan 11, 2015
  1. @tute
Commits on Dec 31, 2014
  1. @tute

    Merge pull request #207 from karlentwistle/master

    Scope Badge.find to Merit module
    tute committed Dec 31, 2014
  2. @karlentwistle

    Scope Badge.find to Merit module

    karlentwistle committed Dec 31, 2014
Commits on Dec 17, 2014
  1. @tute

    Release version 2.3.0.

    Update CHANGELOG.
    
    [ci skip]
    tute committed Dec 17, 2014