Permalink
Commits on Apr 6, 2017
  1. Remove testing on jruby.

    I do not use jruby and don't have personal interest in figuring out what's not working here. I'm very open to others submitting PRs that fix jruby.
    danielmorrison committed Apr 6, 2017
  2. Stop building on Ruby 2.0.

    Ruby 2.0 was EOL in 2016. We don't need to support it going forward.
    danielmorrison committed Apr 6, 2017
  3. Do some evil voodoo to get jruby tests to pass.

    Based on some code from DelayedJob that seems to work. collectiveidea/delayed_job#948
    danielmorrison committed Apr 6, 2017
  4. Merge pull request #355 from Marahin/master

    Make belongs_to relation optional again due to Rails 5 changes
    danielmorrison committed on GitHub Apr 6, 2017
  5. Merge pull request #358 from Spone/patch-1

    README: Specify that attr_accessible is for Rails < 4
    danielmorrison committed on GitHub Apr 6, 2017
  6. Merge pull request #368 from patrickdavey/remove_invalid_link

    remove stale link from README
    danielmorrison committed on GitHub Apr 6, 2017
Commits on Apr 5, 2017
Commits on Mar 9, 2017
Commits on Oct 2, 2016
Commits on Sep 14, 2016
Commits on Aug 12, 2016
  1. Merge pull request #346 from jhawthorn/active_support_on_load

    Use ActiveSupport.on_load to inject modules
    danielmorrison committed on GitHub Aug 12, 2016
  2. Merge pull request #352 from vasinov/patch-1

    Update README.md
    danielmorrison committed on GitHub Aug 12, 2016
Commits on Aug 11, 2016
  1. Update README.md

    Updating some badges to svg and adding a Hakiri security badge.
    vasinov committed on GitHub Aug 11, 2016
Commits on Jul 25, 2016
  1. Merge pull request #350 from krzysiek1507/apprails-fixes

    Appraisals fixes
    danielmorrison committed on GitHub Jul 25, 2016
Commits on Jul 23, 2016
  1. DRY Appraisals

    krzysiek1507 committed Jul 23, 2016
  2. lock combustion < 0.5.5

    krzysiek1507 committed Jul 23, 2016
  3. use rspec-rails ~> 3.5.0

    krzysiek1507 committed Jul 23, 2016
Commits on Jul 14, 2016
  1. Use ActiveSupport.on_load to inject modules

    This solves a load order issue where routes were not loaded in tests due
    to ActionView being referenced here before it was fully loaded.
    
    The rails documentation seems to recommends using these hooks, so I have
    changed active_record to use it as well instead of requiring
    active_record.
    jhawthorn committed Jul 14, 2016
Commits on Jul 5, 2016
  1. Merge pull request #345 from znz/fix-typo

    Fix a typo
    danielmorrison committed on GitHub Jul 5, 2016
  2. Fix a typo

    znz committed Jul 5, 2016
Commits on Jun 1, 2016
  1. Merge pull request #341 from tricknotes/doc

    Fix version in CHANGELOG
    danielmorrison committed Jun 1, 2016
  2. Merge pull request #342 from artofhuman/master

    Add breaking changes to changelog [CI SKIP]
    danielmorrison committed Jun 1, 2016
  3. Add breaking changes to changelog

    artofhuman committed Jun 1, 2016
  4. Fix version in CHANGELOG

    This version should be a `3.1.1`, not a `3.1.0`.
    This is introduced in 2e67e9a.
    tricknotes committed Jun 1, 2016
Commits on May 31, 2016
  1. Switch rbx-2 for rbx

    parndt committed May 31, 2016
  2. Bump version

    danielmorrison committed May 31, 2016
  3. Clean up Rakefile

    danielmorrison committed May 31, 2016
  4. Merge pull request #340 from krzysiek1507/fix-default-scope

    don't use default scope when reloading target due to AR#where scoping
    danielmorrison committed May 31, 2016
Commits on May 29, 2016
Commits on May 27, 2016