Skip to content
Commits on Jul 24, 2011
  1. @oem @fxn

    Changed a few instances of of words in the API docs written in Britis…

    oem committed with fxn Jul 24, 2011
    …h English to
    
    American English(according to Weber)
    
    Conflicts:
    
    	actionpack/lib/action_controller/metal/request_forgery_protection.rb
    	railties/lib/rails/engine.rb
Commits on Jul 23, 2011
  1. @vijaydev @fxn

    spacing fix

    vijaydev committed with fxn Jul 19, 2011
  2. @mjankowski @fxn
Commits on Jul 3, 2011
  1. @spohlenz

    Fix has_migrations? check in Rails::Engine

    spohlenz committed Jul 3, 2011
    (cherry picked from commit a7a58af)
Commits on Jun 18, 2011
  1. @chriseppstein

    Merge remote-tracking branch 'rails/3-1-stable' into asset_urls

    chriseppstein committed Jun 18, 2011
    * rails/3-1-stable: (68 commits)
      Revert changes done in c56618e, 51cb745 and 030950a. The links are pointing to files/*/*.html for usage in api.rubyonrails.org and as a result are broken in GitHub blobs. This is unavoidable (at least for now).
      copy-edits 7c2db6c, cbf2af1, and f391f94
      Added 'Configuring Assets' section to configuring guide
      Update remove_index documentation
      Typo.
      minor clean up generators section
      add info that plugin installs need git or svn installed
      document doc:* rake tasks
      typo changes fixed
      fixed typo chnages
      add details on how to use specific annotations in rake:notes
      document how rake notes work
      The name for the plain text template in Rails3 appears to be method.text.erb, not, method.text.plain.erb.  Updated the doc to reflect this change.  Also fixed a reference to an example that was incorrect.
      form => form_for
      Tweak linebreak in ActionController::Redirecting doc
      Updated rails´s guides on the config.serve_static_assets and it´s settings in production mode using WEBrick. This documentation has it´s roots in #issue1657. You have to set config.serve_static_assets to true in production mode with WEBrick as only this includes ActionDispatch::Static.
      Improve documentation around status code argument of redirect_to
      minor copy edit 0bdeddb
      Jruby => JRuby, Mysql => MySQL
      Moving hint down. As required after all database examples.
      ...
Commits on Jun 14, 2011
  1. @jhtwong

    Patch for #1460

    jhtwong committed Jun 14, 2011
    [3.1.0.rc1] Plugins inside engines not eager-loaded properly and their
    rake tasks ignored
    
    Working with the new support for plugins inside engines in Rails 3.1,
    I found that certain things that work for regular plugins don't work
    for these new nested plugins. In particular, these methods in
    Rails::Engine don't seem to understand that an engine could have
    nested plugins:
    
    #load_tasks
    #load_generators
    #load_console
    #eager_load!
    
    A solution which worked out for me is to move the calls to
    railties.all { ... } from the overriding methods in Rails::Application
    into Rails::Engine.
  2. @chriseppstein
Commits on May 24, 2011
  1. @josevalim

    Everyone receives app as argument for consistency.

    josevalim committed May 25, 2011
    Conflicts:
    
    	railties/lib/rails/application.rb
Commits on May 20, 2011
  1. @josh
Commits on May 18, 2011
  1. @amatsuda

    parenthesize the arguments with splat

    amatsuda committed May 18, 2011
    to make sure we're not calling the :* operator
Commits on May 10, 2011
  1. @dhh
Commits on May 4, 2011
  1. @vijaydev
Commits on Apr 25, 2011
  1. @drogus

    Make ActionController::Base.modules_for_helpers and ActionController:…

    drogus committed Apr 25, 2011
    …:Base.all_helpers_from_path public methods
  2. @drogus
Commits on Apr 15, 2011
  1. @josevalim
  2. @josevalim

    Fix tests.

    josevalim committed Apr 15, 2011
  3. @josevalim
Commits on Mar 28, 2011
  1. @josevalim

    Engines that use isolate_namespace with nested modules should set cor…

    Rolf Timmermans committed with josevalim Mar 28, 2011
    …rect module prefix for their routes.
Commits on Mar 9, 2011
  1. @dcrec1 @spastorino

    refactored Engine.#find by giving an explicit name to a variable and …

    dcrec1 committed with spastorino Mar 5, 2011
    …reducing calls
    
    [#6529 state:committed]
    
    Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
Commits on Mar 5, 2011
  1. @rtlechow @fxn

    Railties typos.

    rtlechow committed with fxn Mar 4, 2011
Commits on Mar 2, 2011
  1. @tenderlove

    only compute path.to_s once

    tenderlove committed Mar 2, 2011
Commits on Jan 19, 2011
  1. @techpeace
Commits on Jan 14, 2011
  1. @techpeace
Commits on Dec 15, 2010
  1. @drogus @vijaydev
Commits on Dec 9, 2010
  1. @josevalim
  2. @drogus
Commits on Nov 22, 2010
  1. @drogus @josevalim

    Do not create table_name_prefix method on isolated module if the meth…

    drogus committed with josevalim Nov 21, 2010
    …od already exists.
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
Commits on Nov 15, 2010
  1. @drogus @josevalim
Commits on Nov 11, 2010
  1. @josevalim

    Add missing autoload.

    josevalim committed Nov 11, 2010
  2. @zhengjia @josevalim

    Remove unused Configurable in Rails::Engine and Rails::Application. R…

    zhengjia committed with josevalim Oct 26, 2010
    …emove unnecessary railties load path in cli [#5871 state:resolved]
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
Commits on Oct 15, 2010
  1. @spastorino
  2. @drogus @spastorino

    Removed duplicated method find_root_with_flag

    drogus committed with spastorino Oct 15, 2010
    Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
  3. @fxn
Commits on Oct 14, 2010
  1. @drogus @josevalim
  2. @drogus @josevalim
Something went wrong with that request. Please try again.