Permalink
Commits on Oct 8, 2012
  1. @rafaelfranca

    Merge pull request #7875 from senny/interpolation_for_execute

    remove unused `expand_range_bind_variables` method
    rafaelfranca committed Oct 8, 2012
  2. @senny

    remove unused `expand_range_bind_variables` method

    this method was not used, not documented and not tested.
    senny committed Oct 8, 2012
  3. @dhh

    Merge pull request #7873 from steveklabnik/update_initializer

    Moving locale stuff from app.rb to an initializer.
    dhh committed Oct 8, 2012
  4. @steveklabnik
  5. @dhh
  6. @dhh

    Inline comment

    dhh committed Oct 8, 2012
  7. @dhh
  8. @dhh
  9. @dhh
  10. @josevalim

    Merge pull request #7872 from kennyj/should_use_app_paths

    Should use app.paths instead of specific path.
    josevalim committed Oct 8, 2012
  11. @kennyj
Commits on Oct 7, 2012
  1. @rafaelfranca

    Merge pull request #6282 from alexeymuranov/rename-fixtures-class

    Rename "ActiveRecord::Fixtures" to "ActiveRecord::FixtureSet"
    rafaelfranca committed Oct 7, 2012
  2. @rafaelfranca

    Merge pull request #7869 from Locke23rus/actionmailer_new_hash_syntax

    Update actionmailer with new hash syntax.
    
    Just to make clear we don't accept this kind of pull request because it can invalidate a lot of pull requests.
    
    I'm accepting this because Action Mailer has only two open pull requests.
    rafaelfranca committed Oct 7, 2012
  3. @alexeymuranov
  4. @alexeymuranov
  5. @alexeymuranov
  6. @Locke23rus
  7. @alexeymuranov

    Rename "Fixtures" class to "FixtureSet"

    Rename `ActiveRecord::Fixtures` class to `ActiveRecord::FixtureSet`.  Instances of this class normally hold a collection of fixtures (records) loaded either from a single YAML file, or from a file and a folder with the same name.  This change make the class name singular and makes the class easier to distinguish from the modules like `ActiveRecord::TestFixtures`, which operates on multiple fixture sets, or `DelegatingFixtures`, `::Fixtures`, etc., and from the class `ActiveRecord::Fixture`, which corresponds to a single fixture.
    alexeymuranov committed May 12, 2012
  8. @fxn
  9. @fxn

    Merge pull request #7650 from kennyj/fix_warning_20120915

    Fix warning: circular require considered harmful.
    fxn committed Oct 7, 2012
  10. @fxn
  11. @jeremy
  12. @jeremy

    Tag the blank log line between dev requests so it's easier to filter …

    …out entire requests with grep -v without leaving a stray newline behind. Example:
    
      # Tag asset requests so it's easy to filter them from dev logs
      config.log_tags = [
        -> request { :assets if request.path.starts_with?(config.assets.prefix) },
        -> request { request.uuid }
      ]
    
      # Watch the logs, ignoring asset requests
      $ tail -100f log/development.log | grep -v assets
    jeremy committed Oct 7, 2012
  13. @rafaelfranca
  14. @jeremy

    Ruby 2 compat. CGI.escapeHTML has changed the way it escapes apostrop…

    …hes a few times, so fix up the test to work with however it chooses to escape.
    jeremy committed Oct 7, 2012
  15. @jeremy

    Ruby 2 compat. Hash[] now raises on bad elements rather than ignoring…

    … them. No sense over-testing this MRI-specific behavior. See ruby/ruby@8d6add9
    jeremy committed Oct 7, 2012
  16. @rafaelfranca

    Fix nodoc comment

    rafaelfranca committed Oct 7, 2012
  17. @rafaelfranca
  18. @rafaelfranca

    We don't need to check blank? here.

    Also the blank? check introduced a bug.
    
    $ rails generate model Foo blank:boolean
    
    form_for(Foo.new(:blank => true)) => ArgumentError, "First argument in form cannot contain nil or be empty"
    rafaelfranca committed Oct 7, 2012
  19. @rafaelfranca

    Update some code styles.

    * Uses the Ruby 1.9 hash syntax
    * Avoid escaping " inside string using the %{} syntax
    rafaelfranca committed Oct 7, 2012
  20. @fxn

    Merge pull request #6475 from joefiorini/responsive-guides

    Responsive guides
    fxn committed Oct 7, 2012
Commits on Oct 6, 2012
  1. @rafaelfranca

    Merge pull request #7864 from teleological/link_to_remote_master

    Accept :remote as symbol in link_to options
    rafaelfranca committed Oct 6, 2012
  2. @rafaelfranca

    Remove unneeded require

    rafaelfranca committed Oct 6, 2012
  3. @rafaelfranca
  4. @teleological

    Accept :remote as symbol in link_to options

    Accept either :remote or 'remote' in both the html_options and
    (url_)options hash arguments to link_to.
    teleological committed Oct 6, 2012