Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Jun 18, 2012
  1. @kennyj @carlosantoniodasilva
  2. @josevalim

    Require thor 0.15.3 onwards

    josevalim authored
Commits on Jun 10, 2012
  1. @josevalim

    Merge pull request #6692 from schneems/schneems/something-went-wrong

    josevalim authored
    Add Prompt to 404 & 500 Pages to Check Logs in Production
  2. @josevalim

    Merge pull request #6665 from schneems/schneems/raise-migration-error

    josevalim authored
    Notify A User they Have Pending Migrations
Commits on Jun 9, 2012
  1. @schneems

    add prompt to 404 & 500 pages to check logs

    schneems authored
    When new programmers push their code to a production server and receive an error they often don't know to check the logs, this simple reminder will help. Most professional applications have custom error pages so this change shouldn't affect them. The wording of the message should not confuse non-developer visitors.
  2. @schneems

    raise error for pending migration

    schneems authored
    can be configured by setting config.active_record.migration. Setting to :page_load will raise an error on each page refresh if there are migrations that are pending. Setting to :page_load is defaulted in development for new applications.
Commits on Jun 8, 2012
  1. @rafaelfranca
  2. @drogus
  3. @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 7, 2012
  1. @rafaelfranca

    Merge pull request #6597 from frodsan/am_include_root_to_false

    rafaelfranca authored
    change AMS::JSON.include_root_in_json default value to false
Commits on Jun 6, 2012
  1. @amatsuda

    reduce number of Strings

    amatsuda authored
  2. @pixeltrix
  3. @fredwu
  4. @frodsan

    change AMS::JSON.include_root_in_json default value to false

    frodsan authored
    Changes:
    
    * Update `include_root_in_json` default value to false for default value
      to false for `ActiveModel::Serializers::JSON`.
    * Remove unnecessary change to include_root_in_json option in
      wrap_parameters template.
    * Update `as_json` documentation.
    * Fix JSONSerialization tests.
    
    Problem:
    
    It's confusing that AM serializers behave differently from AR,
    even when AR objects include AM serializers module.
    
        class User < ActiveRecord::Base; end
    
        class Person
          include ActiveModel::Model
          include ActiveModel::AttributeMethods
          include ActiveModel::Serializers::JSON
    
          attr_accessor :name, :age
    
          def attributes
            instance_values
          end
        end
    
        user.as_json
        => {"id"=>1, "name"=>"Konata Izumi", "age"=>16, "awesome"=>true}
        # root is not included
    
        person.as_json
        => {"person"=>{"name"=>"Francesco", "age"=>22}}
        # root is included
    
        ActiveRecord::Base.include_root_in_json
        => false
    
        Person.include_root_in_json
        => true
    
        # different default values for include_root_in_json
    
    Proposal:
    
    Change the default value of AM serializers to false, update
    the misleading documentation and remove unnecessary change
    to false of include_root_in_json option with AR objects.
    
        class User < ActiveRecord::Base; end
    
        class Person
          include ActiveModel::Model
          include ActiveModel::AttributeMethods
          include ActiveModel::Serializers::JSON
    
          attr_accessor :name, :age
    
          def attributes
            instance_values
          end
        end
    
        user.as_json
        => {"id"=>1, "name"=>"Konata Izumi", "age"=>16, "awesome"=>true}
        # root is not included
    
        person.as_json
        => {"name"=>"Francesco", "age"=>22}
        # root is not included
    
        ActiveRecord::Base.include_root_in_json
        => false
    
        Person.include_root_in_json
        => false
    
        # same behaviour, more consistent
    
    Fixes #6578.
Commits on Jun 5, 2012
  1. @fredwu
Commits on Jun 1, 2012
  1. @amatsuda
Commits on May 31, 2012
  1. 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.
Commits on May 29, 2012
  1. @frodsan
Commits on May 24, 2012
  1. @tenderlove

    `name` should be public.

    tenderlove authored
Commits on May 23, 2012
  1. @vijaydev
  2. @vijaydev

    Revert "Remove blank trailing comments"

    vijaydev authored
    This reverts commit fa6d921.
    
    Reason: Not a fan of such massive changes. We usually close such changes
    if made to Rails master as a pull request. Following the same principle
    here and reverting.
    
    [ci skip]
Commits on May 22, 2012
  1. @gaurish

    Move root method at TOP of routes file

    gaurish authored
    Made the change as per the following text in routing guide:-
    "You should put the root route at the top of the file,
    because it is the most popular route and should be matched first."
    
    However, if root is best left at bottom. We will change to fix that text
  2. @avakhov

    Use new hash syntax for generators gem method

    avakhov authored
    The Gemfile of new application uses ruby 1.9 hashes. Gem method of
    generators should use them too. It prevents from mixing two kinds of
    syntax in one file.
  3. @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.
  4. @avakhov

    Remove obsolete comment from generator gem method

    avakhov authored
    This comment about :env option for gem method was actual for rails 2.3
    without bundler. Now bundler uses grups for this goal.
Commits on May 20, 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 19, 2012
  1. @henrikhodne

    Remove blank trailing comments

    henrikhodne authored
    For future reference, this is the regex I used: ^\s*#\s*\n(?!\s*#). Replace
    with the first match, and voilà! Note that the regex matches a little bit too
    much, so you probably want to `git add -i .` and go through every single diff
    to check if it actually should be changed.
  2. @rafaelfranca

    Merge pull request #3359 from mrreynolds/datamapper_naming_fix

    rafaelfranca authored
    Fixed DataMapper namings in symbols and constants.
  3. @carlosantoniodasilva

    Remove delegated methods from generators test case

    carlosantoniodasilva authored
    `class_attribute` already generates instance readers/writers by default,
    so there's no need to add delegation methods.
    
    Removes some "method redefined" warnings.
Commits on May 17, 2012
  1. @drogus

    Revert changes related to `bundle install` fixes in `rails new`

    drogus authored
    Reverted changes:
      f3482a9 Fix tests in railties
      5904295 improve #6318
      aed906a prevent using already loaded Gemfile for 'bundle install'
    
    In order to fix this, we need a fix in bundler related to GEM_PATH,
    which will allow to run tests properly. I will get this changes back
    when it happens.
Commits on May 16, 2012
  1. @tenderlove

    Merge pull request #6337 from bcardarella/patch-1

    tenderlove authored
    Changing the indentation level of the block comment close for Sass
  2. @mpapis @drogus

    improve #6318

    mpapis authored drogus committed
  3. @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 15, 2012
  1. @vijaydev

    Merge branch 'master' of github.com:lifo/docrails

    vijaydev authored
    Conflicts:
    	actionpack/lib/action_view/helpers/asset_tag_helper.rb
  2. @mpapis
Something went wrong with that request. Please try again.