Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on May 27, 2012
  1. @drogus

    Fix railties_order when application object is passed

    drogus authored
    railites_order method, introduced in 40b19e0, had a bug that was causing
    loading application instance twice in initializers if railties_order
    already included application instance. So for example
    
        railties_order = [Foo::Engine, :main_app, Bar::Engine]
    
    would result in such railties array:
    
        [MyApp::Application, Foo::Engine, MyAppApplication, Bar::Engine]
    
    In order to fix it, we need to check for existence of application in
    both railties_order and railties arrays.
Commits on May 22, 2012
  1. @drogus

    Use require_dependency in generated controllers

    drogus authored
    Using require in development mode will prevent required files from
    reloading, even if they're changed. In order to keep namespaced
    application_controller reloadable, we need to use require_dependency
    instead of require.
Commits on May 21, 2012
  1. @drogus

    More info on commit messages in contributing guide

    drogus authored
    Add more info on how to write a good commit messages along with
    example showing nicely formatted commit message.
    
    Rails git history does not look too well when you try to figure out why
    particular changes were introduced. We can do much better than that and
    it's never too late to start.
  2. @drogus

    Fix generators to help with ambiguous `ApplicationController` issue

    drogus authored
    In development mode, dependencies are loaded dynamically at runtime,
    using `const_missing`. Because of that, when one of the constants is
    already loaded and `const_missing` is not triggered, user can end up
    with unexpected results.
    
    Given such file in an Engine:
    
    ```ruby
    module Blog
      class PostsController < ApplicationController
      end
    end
    ```
    
    If you load it first, before loading any application files, it will
    correctly load `Blog::ApplicationController`, because second line will
    hit `const_missing`. However if you load `ApplicationController` first,
    the constant will be loaded already, `const_missing` hook will not be
    fired and in result `PostsController` will inherit from
    `ApplicationController` instead of `Blog::ApplicationController`.
    
    Since it can't be fixed in `AS::Dependencies`, the easiest fix is to
    just explicitly load application controller.
    
    closes #6413
Commits on May 16, 2012
  1. @bcardarella

    Changing the indentation level of the block comment close for SASS

    bcardarella authored
    If one wants to use use SASS for application.css.sass the comment block indentation is invalid.
Commits on May 14, 2012
  1. @josevalim
  2. @homakov @josevalim

    Update railties/lib/rails/generators/rails/app/templates/config/appli…

    homakov authored josevalim committed
    …cation.rb
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
Commits on May 13, 2012
  1. @Mik-die

    :foreign_key option should be on has_many side of association

    Mik-die authored Erich Menge committed
Commits on May 12, 2012
  1. Update 'getting started' guides for new whitelist security implementa…

    Erich Menge authored
    …tion. Closes #6286.
Commits on May 5, 2012
  1. @drogus
Commits on May 4, 2012
  1. @kucaahbe @Dagnan

    improvements in "caching_with_rails" guide - backported from docrails

    kucaahbe authored Dagnan committed
    Conflicts:
    
    	railties/guides/source/caching_with_rails.textile
Commits on May 1, 2012
  1. @route
Commits on Apr 30, 2012
  1. @drogus

    Failing test for #6034

    drogus authored
Commits on Apr 29, 2012
  1. @drogus
Commits on Apr 28, 2012
  1. Allow Thor 0.15 and 1.0, to be released shortly

    tomhuda authored
Commits on Apr 27, 2012
  1. @tenderlove

    Merge pull request #4528 from j-manu/log-tailer-fix

    tenderlove authored
    Fix for log tailer when the log file doesn't exist.
Commits on Apr 23, 2012
  1. @jeremy

    Merge pull request #5919 from joevandyk/rake-dsl-fix

    jeremy authored
    Only include Rake::DSL if it's defined (Rake >= 0.9)
  2. @arunagw
Commits on Apr 21, 2012
  1. @joevandyk

    Only include Rake::DSL if it's defined.

    joevandyk authored
    rake < 0.9 doesn't define Rake::DSL.
Commits on Apr 18, 2012
  1. @spastorino
Commits on Apr 17, 2012
  1. @asanghi

    Replace ruby-debug19 which doesnt work on 1.9.3 out of the box with a…

    asanghi authored
    … more maintained debugger gem
Commits on Apr 13, 2012
  1. @alekseykulikov @drogus

    "rails new -h" shows message in rails directory

    alekseykulikov authored drogus committed
Commits on Apr 12, 2012
  1. @sikachu @vijaydev

    Fix code example in generator test case

    sikachu authored vijaydev committed
Commits on Apr 9, 2012
  1. @fxn
  2. @spastorino

    Merge pull request #5784 from rafaelfranca/default_url-3-2

    spastorino authored
    [3-2-stable] Document that default_url_options must return a hash with symbolized keys
  3. @rafaelfranca
  4. @rafaelfranca
Commits on Apr 7, 2012
  1. @anildigital @vijaydev

    Fix 'Everyday Git' link

    anildigital authored vijaydev committed
Commits on Apr 6, 2012
  1. @anildigital
Commits on Apr 4, 2012
  1. @hone
  2. @hone
Commits on Apr 1, 2012
  1. @drogus

    Usage file in generators shouldn't be fetched only based on source_root

    drogus authored
    In case `source_roout` is not set, `default_source_root` is used,
    which includes also `templates` directory. If there is no `templates`
    directory, `default_source_root` is not available and USAGE will not
    be displayed. USAGE should be also checked based on default
    directory excluding `templates`.
Commits on Mar 30, 2012
  1. @spastorino
  2. @spastorino

    Bump up to 3.2.3

    spastorino authored
Commits on Mar 29, 2012
  1. @spastorino

    Bumping to 3.2.3.rc2

    spastorino authored
Something went wrong with that request. Please try again.