Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Nov 13, 2014
  1. @tenderlove

    exec_prepared is GVL friendly, so lets use it.

    tenderlove authored
    also increase the version of pg required so that people will get the
    GVL friendly version
Commits on Jul 8, 2014
  1. @tenderlove

    Merge pull request #13999 from jamox/update_rack

    tenderlove authored
    This updates rails to use edge rack
Commits on Apr 9, 2014
  1. @tenderlove

    oops! Fix Gemfile. :bomb:

    tenderlove authored
  2. @tenderlove
  3. @tenderlove

    Merge branch 'master' into adequaterecord

    tenderlove authored
    * master: (26 commits)
      Avoid URI parsing
      Add missing require so requiring `active_support/cache` works again.
      depend_on_asset is not required anymore on sprockets-rails 2.1.2
      upgrading section for 4.1 is no longer WIP. [ci skip]
      Expand explanation of how to set secrets.yml. [ci skip]
      Guides: minor typo fixed [ci skip]
      Fixed problem where `1.day.eql?(1.day)` is false
      new CHANGELOGs entries are in the top [ci skip]
      Updates the maintenance policy with new Rails versions
      Dont abbreviate that which needs no abbreviation
      Dont encourage aliases now that we have variants
      Use short-form for the scaffold render calls and drop the needless test
      Drop in @jeremy's new database.yml template text
      Don't deprecate after all
      Less ambition, more deprecation
      Ensure we correctly and immediately load all ENV entries
      Give a deprecation message even when the lookup fails
      Rearrange the config merger some more
      entry is always a Hash
      Check env_url only once
      ...
    
    Conflicts:
    	Gemfile
  4. @tenderlove
Commits on Feb 26, 2014
  1. @tenderlove

    Merge branch 'master' into adequaterecord

    tenderlove authored
    * master: (55 commits)
      [ci skip] Move association class method notes
      extract common code in `uuid_test.rb`.
      move PostgreSQL UUID tests from `datatype_test.rb` to `uuid_test.rb`.
      [ci skip] remove guide section on models in migrations
      test case for custom PostgreSQL enum type.
      Remove inclusion of rubysl gem for rbx on generated Gemfile
      let `insert_record` actuall save the object.
      [skip ci] Fix test name typo in app generator tests.
      travis s/2.1.0/2.1.1
      Bump version of bcrypt gem
      Skip test_migrate_revert_add_index_with_name if databases do not allow to create duplicate indexes on the same columns
      Optimize getting started guide images, and use png instead of jpg
      :scissors: [ci skip]
      Point master changelogs to 4-1-stable branch
      Add missing parantheses in index_exists?
      `ActionDispatch::Head` was replaced by `Rack::Head`. Closes #14191.
      [skip ci] Standardized punctuation.
      [skip ci] Fix typo in link_to :method option description
      refactor, with_locale is not needed because I18n is mocked.
      Fix ActionView label translation for more than 10 nested elements
      ...
Commits on Feb 17, 2014
  1. @tenderlove

    Merge branch 'master' into adequaterecord

    tenderlove authored
    * master: (311 commits)
      Add a missing changelog entry for #13981 and #14035
      Revert "Fixed plugin_generator test"
      implements new option :month_format_string for date select helpers [Closes #13618]
      add factory methods for empty alias trackers
      guarantee a list in the alias tracker so we can remove a conditional
      stop exposing table_joins
      make most parameters to the AliasTracker required
      make a singleton for AssociationScope
      pass the association and connection to the scope method
      pass the tracker down the stack and construct it in the scope method
      clean up add_constraints signature
      remove the reflection delegate
      remove klass delegator
      remove railties changes. fixes #14054
      remove chain delegate
      remove scope_chain delegate
      Add verb to sanitization note
      fix path shown in mailer's templates
      updated Travis build status image url
      fix guide active_support_core_extensions. add Note to String#indent [ci skip]
      ...
    
    Conflicts:
    	activerecord/lib/active_record/associations/join_dependency.rb
    	activerecord/test/cases/associations/association_scope_test.rb
Commits on Jan 15, 2014
  1. @tenderlove

    use edge arel

    tenderlove authored
Commits on May 16, 2013
  1. @tenderlove

    Merge pull request #10527 from zenspider/squishy_minitest5

    tenderlove authored
    Squishy minitest5
Commits on Mar 15, 2013
  1. @tenderlove

    oops!

    tenderlove authored
  2. @tenderlove
Commits on Mar 11, 2013
  1. @tenderlove
Commits on Sep 25, 2012
  1. @tenderlove

    Revert "Use plaform mri_19 for debugger gem"

    tenderlove authored
    This reverts commit 2233f14.
Commits on Aug 23, 2012
  1. @tenderlove
Commits on Jul 4, 2012
  1. @tenderlove
Commits on Jul 3, 2012
  1. @tenderlove
Commits on May 18, 2012
  1. @tenderlove
Commits on Mar 26, 2012
  1. @tenderlove

    Merge pull request #5595 from guilleiguaran/sprockets-rails-1.0.0

    tenderlove authored
    sprockets-rails 1.0.0 was released, remove git dependency from Gemfile
Commits on Dec 21, 2011
  1. @tenderlove

    switch to git journey

    tenderlove authored
Commits on Dec 14, 2011
  1. @tenderlove
Commits on Nov 17, 2011
  1. @tenderlove

    allow people to set a local .Gemfile so that things like ruby-debug a…

    tenderlove authored
    …re not required for regular development
Commits on Nov 16, 2011
  1. @tenderlove
Commits on Sep 12, 2011
  1. @tenderlove
Commits on May 1, 2011
  1. @tenderlove
Commits on Apr 27, 2011
  1. @tenderlove
Commits on Apr 22, 2011
  1. @tenderlove

    bumping the pg requirements

    tenderlove authored
Commits on Feb 9, 2011
  1. @tenderlove
  2. @tenderlove
Commits on Feb 8, 2011
  1. @tenderlove
Commits on Feb 2, 2011
  1. @tenderlove

    using mysql2 from git

    tenderlove authored
Commits on Jan 16, 2011
  1. @tenderlove
Commits on Jan 14, 2011
  1. @tenderlove

    use rack-test from git

    tenderlove authored
Commits on Nov 16, 2010
  1. @tenderlove
Commits on Oct 30, 2010
  1. @tenderlove
Something went wrong with that request. Please try again.