aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-2413-99/+133
|\ | | | | | | | | Conflicts: guides/source/ruby_on_rails_guides_guidelines.textile
| * spacing fix in guide [ci skip]Vijay Dev2012-03-241-1/+1
| |
| * [getting started][ci skip] fix link to the codeFabián Rodríguez2012-03-231-1/+1
| |
| * :foreign_key option should be on has_many side of associationMikhail Dieterle2012-03-231-2/+2
| |
| * Adding documentation for ActiveRecord::Base.abstract_class to clarify a ↵Joe Goggins2012-03-221-0/+14
| | | | | | | | particular usecase for this feature (to allow you to use inheritance in ActiveRecord without using the STI table name
| * Update config.assets.initialize_on_precompile warning to include engine side ↵adman652012-03-221-1/+3
| | | | | | | | affects
| * [engines] [ci-skip] Add example of precompiling engine assetsadman652012-03-221-0/+15
| |
| * improvements in "caching_with_rails" guidekucaahbe2012-03-221-8/+10
| |
| * Fixed-width font fix for instance variableJuanjo Bazán2012-03-201-1/+1
| |
| * [ci skip] Make guides more readable & consistentMark D. Blackwell2012-03-203-82/+83
| |
| * Correct description of ['migrated_at > ?', 1.week.ago] from "more than a ↵Dave Burt2012-03-201-1/+1
| | | | | | | | week ago" to "more recently than a week ago."
| * Merge branch 'master' of github.com:lifo/docrailsCharles Brian Quinn2012-03-191-1/+1
| |\
| | * Adding comma to correct syntax in comment.Jesse Brown2012-03-191-1/+1
| | |
| * | Updates ActionMailer Base summary and fixes space in code example.Charles Brian Quinn2012-03-191-4/+4
| |/
* | Merge pull request #5569 from arunagw/warning_remove_masterVijay Dev2012-03-241-1/+1
|\ \ | | | | | | removed warning: shadowing outer local variable - exception
| * | removed warning: shadowing outer local variable - exceptionArun Agrawal2012-03-241-1/+1
|/ /
* | Merge pull request #5567 from tpope/xhr-booleanAaron Patterson2012-03-231-1/+1
|\ \ | | | | | | Return an actual boolean from xml_http_request?
| * | Return an actual boolean from xml_http_request?Tim Pope2012-03-231-1/+1
|/ /
* | oops, forgot to commit the tests! :bomb:Aaron Patterson2012-03-231-0/+67
| |
* | chdir before globbing so that we don't need to escape directory names.Aaron Patterson2012-03-231-1/+30
| | | | | | | | fixes #5521
* | Merge pull request #5550 from schneems/schneems/server_envAaron Patterson2012-03-234-0/+63
|\ \ | | | | | | Fix environment support for rails server, and match interface of rails console
| * | match rails console environment support, to serverschneems2012-03-222-0/+32
| | | | | | | | | | | | rails server takes `-e` as an argument to specify RAILS_ENV, rails console currently does not have the same interface. This commit fixes this disparity so developers can manually specify `RAILS_ENV` or can pass in an environment with a `-e`.
| * | fix rails server support of RAILS_ENV variableschneems2012-03-202-0/+31
| | | | | | | | | | | | | | | | | | | | | When launching rails server from the command line with a rails environment specified such as `rails server RAILS_ENV=production` an error would occur since rails will try to use `RAILS_ENV=production` as it's server. When launching rails with a specified server such as thin `rails server thin RAILS_ENV=production` no error will be thrown, but rails will not start up in the specified environment. This fixes both of those cases
* | | Merge pull request #5518 from rafaelfranca/minor-refactorJosé Valim2012-03-231-11/+11
|\ \ \ | | | | | | | | Remove code duplication
| * | | Remove code duplicationRafael Mendonça França2012-03-191-11/+11
| | | |
* | | | Merge pull request #5556 from rafaelfranca/remove-warningPiotr Sarnacki2012-03-231-1/+1
|\ \ \ \ | | | | | | | | | | use the new scope syntax on the tests to avoid DEPRECATION WARNINGS.
| * | | | Use the new scope syntaxRafael Mendonça França2012-03-231-1/+1
|/ / / /
* | | | Merge pull request #5374 from ↵José Valim2012-03-232-28/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nertzy/remove_deprecated_partial_path_from_active_model_naming Remove ActiveModel::Naming#partial_path
| * | | | Remove ActiveModel::Naming#partial_pathGrant Hutchins2012-03-102-28/+1
| | | | | | | | | | | | | | | It was deprecated in 3.2
* | | | | Fix tests, when creating rescue handler, we need to check for arity nowPiotr Sarnacki2012-03-231-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before it was handled by Proc.bind, but since Proc.bind has been deprecated, this is no longer the case and returned handler needs to match rescuer.
* | | | | Merge pull request #5546 from mptre/masterPiotr Sarnacki2012-03-232-4/+5
|\ \ \ \ \ | | | | | | | | | | | | Fixed missing space bug introduces in rails/rails@9299bfd
| * | | | | Fixed missing space bug introduces in ↵Anton Lindqvist2012-03-222-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | rails/rails@9299bfdcd387253d83b645c205b8df477f2d0940.
* | | | | | properly namespace the fixture exceptionAaron Patterson2012-03-222-7/+3
| | | | | |
* | | | | | Merge pull request #5552 from lest/patch-3Aaron Patterson2012-03-223-6/+11
|\ \ \ \ \ \ | |/ / / / / |/| | | | | deprecate Proc#bind that can cause symbol memory leak
| * | | | | deprecate Proc#bind that can cause symbol memory leakSergey Nartimov2012-03-223-6/+11
|/ / / / /
* | | | | Merge pull request #5540 from mhfs/another_blank_line_fixPiotr Sarnacki2012-03-212-2/+1
|\ \ \ \ \ | | | | | | | | | | | | Avoid another blank line in generated migration and remove assertion as per @spastorino request
| * | | | | Avoid another blank line in generated migration and remove assertion as per ↵Marcelo Silveira2012-03-212-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | @spastorino request
* | | | | | remove duplicate requires. thanks @atamboAaron Patterson2012-03-211-1/+0
| | | | | |
* | | | | | evented listeners can subscribe to any messageAaron Patterson2012-03-211-9/+27
| | | | | |
* | | | | | evented subscribers workAaron Patterson2012-03-211-6/+10
| | | | | |
* | | | | | start / finish events are sent by the instrumenterAaron Patterson2012-03-212-7/+41
| | | | | |
* | | | | | push the autoloads up to requiresAaron Patterson2012-03-211-4/+4
|/ / / / /
* | | | | Deprecate eager-evaluated scopes.Jon Leighton2012-03-2120-83/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use this: scope :red, where(color: 'red') default_scope where(color: 'red') Use this: scope :red, -> { where(color: 'red') } default_scope { where(color: 'red') } The former has numerous issues. It is a common newbie gotcha to do the following: scope :recent, where(published_at: Time.now - 2.weeks) Or a more subtle variant: scope :recent, -> { where(published_at: Time.now - 2.weeks) } scope :recent_red, recent.where(color: 'red') Eager scopes are also very complex to implement within Active Record, and there are still bugs. For example, the following does not do what you expect: scope :remove_conditions, except(:where) where(...).remove_conditions # => still has conditions
* | | | | Avoid obscure &Proc.new thingJon Leighton2012-03-211-2/+2
| | | | |
* | | | | Remove valid_scope_name? check - use rubyJon Leighton2012-03-212-30/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scope is syntactic sugar for defining a class method. Ruby allows redefining methods but emits a warning when run with -w. So let's not implement our own logic for this. Users should run with -w if they want to be warned about redefined methods.
* | | | | no need for castJon Leighton2012-03-211-1/+0
| | | | |
* | | | | no need for lvarJon Leighton2012-03-211-3/+1
| | | | |
* | | | | split subscribers based on pattern typeAaron Patterson2012-03-211-13/+31
| | | | |
* | | | | Merge pull request #5532 from mhfs/migration_blank_lineJosé Valim2012-03-212-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Remove blank line from generated migration
| * | | | | Remove blank line from generated migrationMarcelo Silveira2012-03-202-1/+2
| | |_|/ / | |/| | |