Permalink
Switch branches/tags
Commits on Jan 17, 2017
  1. Remove `DEFAULT NULL` for primary key column to support MySQL 5.7.3

    yahonda authored and pixeltrix committed Dec 5, 2013
    Since MySQL 5.7.3 m13 does now allow primary key column is null.
    
    (cherry picked from commit b665588)
Commits on Jan 4, 2017
  1. Restrict nokogiri on Ruby 2.0

    pixeltrix committed Jan 4, 2017
    The recent 1.7.0 release of nokogiri dropped support
    for unsupported rubies.
  2. Restrict w3c_validators to less than 1.3

    pixeltrix committed Jan 4, 2017
    This is because rdoc 3.10 has a dependency on json ~> 1.4 and
    w3c_validators 1.3.0 requires json ~> 2.0.
  3. Restrict jquery-rails to less than 4.0

    pixeltrix committed Jan 4, 2017
    This is because jquery-rails 4.0.0 and later requires railties >= 4.2.0.
  4. Test on Ruby 2.3.3

    pixeltrix committed Jan 4, 2017
Commits on Dec 2, 2016
  1. TestCase does not need to be loaded when loading the framework

    tenderlove authored and pixeltrix committed Jun 15, 2012
    (cherry picked from commit 8b35a23)
Commits on Nov 17, 2016
  1. Run tests on latest versions of 2.2 and 2.3

    pixeltrix committed Nov 17, 2016
Commits on Nov 11, 2016
  1. Merge pull request #26962 from rails/fix-3-2-stable-on-ruby-2-3

    pixeltrix committed Nov 11, 2016
    Fix Rails 3-2-stable on Ruby 2.3.1
Commits on Nov 4, 2016
  1. Allow time for reloading to happen

    pixeltrix committed Nov 4, 2016
    Sometimes the modification time hasn't changed so the reloader
    doesn't pick up the changed files. This is especially true when
    booting the app and then modifying files.
Commits on Nov 3, 2016
  1. Reinstate railties tests on Ruby 1.8.7

    pixeltrix committed Nov 3, 2016
    Something changed in Bundler 1.12.0 that caused the railties tests
    to start failing so lock the bundler version to 1.11.2.
  2. Fix method redefined warnings for + and - on Time

    pixeltrix committed Nov 3, 2016
    The power_assert gem has a workaround for a Ruby 2.3 bug[1] which
    causes method refined warnings with operator methods on Time. Work
    around the workaround by loading Active Support time extensions
    before loading the test-unit gem.
    
    [1]: https://bugs.ruby-lang.org/issues/11182
  3. Tweak conditionals on YAML handling

    pixeltrix committed Nov 3, 2016
    There's no YAML::ENGINE constant in Ruby 1.8 and Ruby 2.2+ but
    the former still needs to use the deprecated Syck behavior.
  4. Adjust tests for differences between Ruby 1.8 and 1.9

    pixeltrix committed Nov 3, 2016
    Ruby 1.9 added Hash#select! and return a hash from Hash#select
    whereas Ruby 1.8 returned an array.
  5. Flushing all logs fixed in Ruby 2.3

    pixeltrix committed Nov 3, 2016
    Previously, flushing all logs in Ruby 2.0 and later would raise an
    exception when there was no DATABASE_URL or database.yml. Whatever
    was the cause of that seems to have been fixed in Ruby 2.3.
  6. Fix uninitialized warning with @new_record instance variable

    pixeltrix committed Nov 3, 2016
    Initializing @stale_state to nil when an association is built fixes a
    marshalling error - see #5268 for more details.
Commits on Nov 2, 2016
  1. Fix indenting

    pixeltrix committed Nov 2, 2016
  2. Only override to_yaml if YAML::ENGINE is defined

    pixeltrix committed Nov 2, 2016
    The Syck engine has been removed from later versions of Ruby so
    no need to override to_yaml for these versions.
  3. Fix raising uniqueness constraints in newer versions of SQLite

    pixeltrix committed Nov 2, 2016
    Versions 3.8.2 and later of SQLite changed the formatting of the error
    messages returned when a uniqueness constraint was violated.
  4. Fix inconsistencies in path with missing helpers

    pixeltrix committed Nov 2, 2016
    Ruby 2.0 and later demonstrate some inconsistencies when a helper file
    is not found with the path method on LoadError. By creating a subclass
    of LoadError we can cater for the inconsistencies.
  5. Fix method redefinition warnings in i18n gem

    pixeltrix committed Nov 2, 2016
    The i18n gem adds its own copies of deep_merge, except and slice if
    they haven't been defined so require them early to prevent any
    method redefinition warnings from appearing.
  6. Fix AS::HWIA#select and #reject on Ruby 2.1.1+

    pixeltrix committed Nov 2, 2016
    In Ruby 2.1.1 and later select and reject return a new instance of
    Hash rather than the subclass so we need to override them to return
    an instance of the correct class.
  7. Fix AS::OrderHash#select and #reject on Ruby 2.1.1+

    pixeltrix committed Nov 2, 2016
    In Ruby 2.1.1 and later select and reject return a new instance of
    Hash rather than the subclass so we need to override them to return
    an instance of the correct class.