Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Aug 1, 2012
  1. @spastorino

    Bump to 3.2.8.rc1

    spastorino authored
  2. @rafaelfranca

    Revert "Deprecate `:confirm` in favor of `:data => { :confirm => 'Tex…

    rafaelfranca authored
    …t' }` option"
    
    Revert "Deprecate `:disable_with` in favor of `'data-disable-with'` option for `button_to` and `submit_tag` helpers."
    
    This reverts commit fc092a9.
    This reverts commit e9051e2.
    This reverts commit d47d6e7.
    This reverts commit 21141e7.
  3. @rafaelfranca

    Merge pull request #7070 from jmazzi/3-2-stable

    rafaelfranca authored
    Update documentation for Rails::Application#env_config
  4. @rafaelfranca

    Merge pull request #7147 from pferdefleisch/scaffold_controller_docs

    rafaelfranca authored
    Updated scaffold_controller generator docs #7146
Commits on Jul 28, 2012
  1. @frodsan

    Backport #6995 to 3-2 stable

    frodsan authored
    Update `test_help` to config properly turn natural language option.
    Last versions of Turn don't monkey patch MiniTest to setup
    the natural language option. Here is an [example](https://github.com/TwP/turn/blob/master/try/test_autorun_minitest.rb#L3).
    
    This patches the following behaviour:
    
        $ rake test:units
        `<top (required)>': undefined method `use_natural_language_case_names='
        for MiniTest::Unit:Class (NoMethodError)
Commits on Jul 26, 2012
  1. @tenderlove

    bumping to 3.2.7

    tenderlove authored
Commits on Jul 23, 2012
  1. @tenderlove

    updating the version

    tenderlove authored
Commits on Jul 16, 2012
  1. @jmazzi
Commits on Jun 18, 2012
  1. @josevalim
Commits on Jun 11, 2012
  1. @tenderlove

    bumping version numbers

    tenderlove authored
  2. @rafaelfranca

    Merge pull request #6690 from suginoy/fix-templates-copy

    rafaelfranca authored
    Fix: 'rake rails:templates:copy' doesn't work
    Conflicts:
    	railties/test/application/rake_test.rb
Commits on Jun 8, 2012
  1. @drogus
  2. @arunagw

    We should not include engine.rake file into rake

    arunagw authored
    if we are passing -T which is skip_test_unit
    
    See issue #6673 for more details.
    
    I saw that we are not creating dummy app even if 
    we do skip_test_unit. 
    
    Fixes #6673
Commits on Jun 5, 2012
  1. @carlosgaldino

    Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` op…

    carlosgaldino authored
    …tion
    
    This deprecation applies to:
    `button_to`
    `button_tag`
    `image_submit_tag`
    `link_to`
    `submit_tag`
    
    As :confirm is an UI specific option is better to use the data attributes,
    teaching users about unobtrusive JavaScript and how Rails works with it.
Commits on Jun 1, 2012
  1. @amatsuda
  2. @tenderlove

    bumping to 3.2.5

    tenderlove authored
Commits on May 31, 2012
  1. @tenderlove

    Merge branch '3-2-rel' into 3-2-stable

    tenderlove authored
    * 3-2-rel:
      bumping to 3.2.4
      adding security notifications to CHANGELOGs
      updating changelogs
      Merge pull request #6558 from parndt/fix_regression
  2. @tenderlove

    Merge branch '3-2-stable-sec' into 3-2-stable

    tenderlove authored
    * 3-2-stable-sec:
      Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this!
      predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this
      bumping to 3.2.4.rc1
  3. @tenderlove

    bumping to 3.2.4

    tenderlove authored
  4. Changed symbol platform to platforms for the commented out call to ge…

    Martin O'Connor authored
    …m 'therubyracer'.
    
    Dependency.rb expects the symbol to be named :platforms as opposed to platform. RubyMine's inspections indicate that the symbol should be named :platforms.
    Updating tests.
Commits on May 28, 2012
  1. @tenderlove

    bumping to 3.2.4.rc1

    tenderlove authored
  2. @bkzl @oscardelben

    Display annotations from .coffee files in `rake notes`

    bkzl authored oscardelben committed
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

    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 5, 2012
  1. @drogus
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 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
Something went wrong with that request. Please try again.