Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Dec 9, 2012
  1. @rafaelfranca

    Remove the spaces after the open bracket and before the close bracket.

    rafaelfranca authored
    All our generated code follow this rule
  2. @georgeclaghorn

    Make code statistics rake task handle new test locations properly

    georgeclaghorn authored
    As of 2a68f68:
    
    - Unit tests are now in test/models, instead of test/units
    - Functional tests are now in test/controllers, instead of
      test/functional
    - Helper tests are now in test/helpers, instead of test/units/helpers
    - Mailer tests are now in test/mailers, instead of test/functional
    
    Update the rake task for code statistics (`rake stats`) so that it
    recognizes files in the above locations as tests, and accurately
    calculates statistics such as "Test LOC" and "Code to Test Ratio."
    Safely handle Rails apps that still have tests in the old locations.
Commits on Dec 8, 2012
  1. @carlosantoniodasilva

    Fix method assertion ensuring it will match "end" with the same inden…

    carlosantoniodasilva authored
    …tation
    
    Otherwise it was matching "end" lines from blocks within the method body,
    making tests such as the migration ones fail.
  2. @carlosantoniodasilva

    Merge pull request #8461 from frodsan/fix_assert_method_generators

    carlosantoniodasilva authored
    Fix #assert_instance_method to also assert indented methods
  3. Fix #assert_instance_method to also assert indented methods

    Francesco Rodriguez authored
  4. @carlosantoniodasilva

    Merge pull request #8395 from bmaland/attr_accessors

    carlosantoniodasilva authored
    Use attr_accessor for Rails.{application,cache,logger}
  5. use :only instead of :except callback option in the controller template

    Francesco Rodriguez authored
    As [Security Guide](http://edgeguides.rubyonrails.org/security.html#whitelists-versus-blacklists)
    says, it's better to use `before_filter only: []` instead of `except: []`
    so we don't forget to turn the filter off for newly added actions.
Commits on Dec 7, 2012
  1. @dhh
Commits on Dec 5, 2012
  1. @reed
  2. @kennyj
  3. @pixeltrix
  4. @freegenie
  5. @claudiob

    Replace comments' non-breaking spaces with spaces

    claudiob authored
    Sometimes, on Mac OS X, programmers accidentally press Option+Space
    rather than just Space and don’t see the difference. The problem is
    that Option+Space writes a non-breaking space (0XA0) rather than a
    normal space (0x20).
    
    This commit removes all the non-breaking spaces inadvertently
    introduced in the comments of the code.
Commits on Dec 4, 2012
  1. @dhh
  2. @yasuoza

    Locate `=require turbolinks` at the bottom of application.js

    yasuoza authored
    Turbolinks should be located at the bottom of application.js
    to detect assets change properly.
Commits on Dec 3, 2012
  1. @kennyj
Commits on Dec 2, 2012
  1. @rafaelfranca

    Merge pull request #8394 from acangiano/add_db_folder_to_annotations

    rafaelfranca authored
    Add db to the list of default annotation folders
Commits on Dec 1, 2012
  1. @mmb

    Quote ~ in git config global excludes command.

    mmb authored
    This will put ~/ in .gitconfig so it will not be hardcoded to the home
    directory where the command was run.
  2. @bmaland
  3. @acangiano
Commits on Nov 29, 2012
  1. @amparo-luna
  2. @rafaelfranca

    Remove observers and sweepers

    rafaelfranca authored
    They was extracted from a plugin.
    
    See https://github.com/rails/rails-observers
    
    [Rafael Mendonça França + Steve Klabnik]
Commits on Nov 27, 2012
  1. @rafaelfranca

    Revert "Merge pull request #8341 from amatsuda/bundle_source_rubygems"

    rafaelfranca authored
    This reverts commit 33b29e0, reversing
    changes made to ac8c729.
    
    Reason:
    
    #4684 (comment)
  2. @amatsuda

    default source in Gemfiles to :rubygems rather than hardcoding the URL

    amatsuda authored
    * I guess this would be the preferrable default for Bundler
    * current version of Bundler converts :rubygems into 'http://rubygems.org';, not https://,
      and that will help those who are working on a very poor network environment that doesn't allow SSL
Commits on Nov 20, 2012
  1. @arunagw
  2. @gaurish

    Better Error handling when parsing database.yaml

    gaurish authored
    Provides a better error message incase the database.yaml
    has some errors.
Commits on Nov 19, 2012
  1. @rafaelfranca

    Merge pull request #8262 from senny/8229_correct_bundler_require_in_e…

    rafaelfranca authored
    …ngines
    
    require bundler groups to include rake-tasks in engines
  2. @carlosantoniodasilva

    Refactor config abort message a bit for dbconsole

    carlosantoniodasilva authored
    Remove not used variable.
    Remove config attr_reader causing warning.
    Fix indent in runner file.
  3. @carlosantoniodasilva

    Fix rails db command with sqlite3 database

    carlosantoniodasilva authored
    When using sqlite3 it was attempting to find the database file based on
    Rails.root, the problem is that Rails.root is not always present because
    we try to first manually load "config/database.yml" instead of loading
    the entire app, to make "rails db" faster.
    
    This means that when we're in the root path of the app, calling "rails db"
    won't allow us to use Rails.root, making the command fail for sqlite3
    with the error:
    
        ./rails/commands/dbconsole.rb:62:in `start':
          undefined method `root' for Rails:Module (NoMethodError)
    
    The fix is to simply not pass any dir string to File.expand_path, which
    will make it use the current directory of the process as base, or the
    root path of the app, which is what we want.
    
    When we are in any other subdirectory, calling "rails db" should work
    just fine, because "config/database.yml" won't be found, thus "rails db"
    will fallback to loading the app, making Rails.root available.
    
    Closes #8257.
Commits on Nov 18, 2012
  1. @senny

    require bundler groups to include rake-tasks in engines

    senny authored
    If you generate a full engine, this will include rake tasks from
    your gem under the `app` namespace. For example if you have a dependency
    on `rspec-rails` in your engine's `gemspec`. You will get the task `app:spec`
    
    Closes #8229
Commits on Nov 17, 2012
  1. @rnesius

    Adding sqlserver.yml template to satisfy "-d sqlserver" being given

    rnesius authored
    invocations of "rails new".
Commits on Nov 16, 2012
  1. @vijaydev

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

    vijaydev authored
    Conflicts:
    	actionpack/lib/action_dispatch/routing/redirection.rb
  2. @spastorino

    Add UpgradeSignatureToEncryptionCookieStore

    spastorino authored
    This allows easy upgrading from the old signed Cookie Store <= 3.2
    or the deprecated one in 4.0 (the ones that doesn't use key derivation)
    to the new one that signs using key derivation
  3. @carlosantoniodasilva
Commits on Nov 15, 2012
  1. @spastorino

    Merge pull request #8112 from rails/encrypted_cookies

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