Permalink
Commits on Jul 4, 2010
  1. Adds tests for content negotiation change introduced in dc5300a

    Patrik Stenmark committed with wycats May 15, 2010
    Signed-off-by: wycats <wycats@gmail.com>
  2. ARGV.empty? is useless. If ARGV is empty, ARGV.first != "new" will al…

    madjo committed with josevalim Jul 4, 2010
    …ways be true
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
  3. Fix syntax of routing tests so they actually run

    pixeltrix committed with josevalim Jul 4, 2010
    Signed-off-by: José Valim <jose.valim@gmail.com>
  4. Refactor resource options and scoping. Resource classes are now only …

    pixeltrix committed with josevalim Jul 4, 2010
    …responsible for controlling how they are named. All other options passed to resources are pushed out to the scope.
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
Commits on Jul 3, 2010
  1. Fixes for "router" and "routes" terminology

    wincent committed with josevalim Jul 3, 2010
    Commit f7ba614 improved the internal consistency of the different
    means of accessing routes, but it introduced some problems at the level
    of code comments and user-visible strings.
    
    This commit applies fixes on three levels:
    
    Firstly, we remove or replace grammatically invalid constructs such as
    "a routes" or "a particular routes".
    
    Secondly, we make sure that we always use "the router DSL" or "the
    router syntax", because this has always been the official terminology.
    
    Finally, we make sure that we only use "routes" when referring to the
    application-specific set of routes that are defined in the
    "config/routes.rb" file, we use "router" when referring on a more
    abstract level to "the code in Rails used to handle routing", and we use
    "routing" when we need an adjective to apply to nouns such as
    "url_helpers. Again this is consistent with historical practice and
    other places in the documentation.
    
    Note that this is not a sweep over the entire codebase to ensure
    consistent usage of language; it is just a revision of the changes
    introduced in commit f7ba614.
    
    Signed-off-by: Wincent Colaiuta <win@wincent.com>
    Signed-off-by: José Valim <jose.valim@gmail.com>
  2. Refactor recall parameter normalization [#5021 state:resolved]

    pixeltrix committed with josevalim Jul 3, 2010
    Signed-off-by: José Valim <jose.valim@gmail.com>
  3. Removes the dependency that AMo has on tzinfo

    spastorino committed Jul 3, 2010
    [#4979 state:committed]
Commits on Jul 2, 2010
  1. Time#as_json: use Time#formatted_offset instead of strftime %z direct…

    gbuesing committed with jeremy Jul 2, 2010
    …ive, which is non-standard and inaccurate on some platforms (e.g., Mac OS X).
    
    [#4979]
    
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
  2. Fix indent

    jeremy committed Jul 2, 2010
Commits on Jul 1, 2010
  1. bump erubis version to 2.6.6 and thor version to 0.13.7

    spastorino committed with josevalim Jul 1, 2010
    Signed-off-by: José Valim <jose.valim@gmail.com>
  2. Time has it own implementation of xmlschema, now AMo doesn't depend o…

    spastorino committed with josevalim Jul 1, 2010
    …n TZInfo
    
    [#4979 state:committed]
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
  3. Unify routes naming by renaming router to routes

    drogus committed with josevalim Jul 1, 2010
    Signed-off-by: José Valim <jose.valim@gmail.com>
  4. porting session.clear fix to master branch. [#5030 state:resolved]

    tenderlove committed with jeremy Jul 1, 2010
    Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
  5. Avoid calls to Rails::Application since this is not the official API.

    josevalim committed Jul 1, 2010
    Your application should *always* reference your application const (as Blog::Application) and Rails.application should be used just internally.
  6. fix failure if behavior is not define and try use the default

    shingara committed with josevalim Jul 1, 2010
    Signed-off-by: José Valim <jose.valim@gmail.com>
Commits on Jun 30, 2010
  1. Don't remove scheduled destroys when loading an association. [#4642 s…

    chewi committed with josevalim Jun 30, 2010
    …tate:resolved]
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
  2. Merge remote branch 'rails/master'

    fxn committed Jun 30, 2010
  3. Support any mysql-like adapter

    jeremy committed Jun 30, 2010
  4. docs: note that mail() accepts arbitrary headers

    wincent committed Jun 29, 2010
    The documentation makes it sound like mail() only accepts a limited
    set of headers in the headers hash, but it in fact accepts any
    arbitrary headers, and there is a test ("can pass random headers in
    as a hash to mail") for it in the test suite.
    
    Signed-off-by: Wincent Colaiuta <win@wincent.com>
  5. add note of which configuration option to set in deprecation warning …

    bodhi committed with josevalim Jun 30, 2010
    …message [#5012 state:resolved]
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
  6. Fix ActiveSupport::Multibyte::Chars#slice for empty strings when star…

    Alex Muntean committed with josevalim May 28, 2010
    …ting offset is negative [#4717 state:resolved]
    
    Signed-off-by: José Valim <jose.valim@gmail.com>