Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5569 from arunagw/warning_remove_master | Vijay Dev | 2012-03-24 | 1 | -1/+1 |
|\ | | | | | removed warning: shadowing outer local variable - exception | ||||
| * | removed warning: shadowing outer local variable - exception | Arun Agrawal | 2012-03-24 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #5567 from tpope/xhr-boolean | Aaron Patterson | 2012-03-23 | 1 | -1/+1 |
|\ | | | | | Return an actual boolean from xml_http_request? | ||||
| * | Return an actual boolean from xml_http_request? | Tim Pope | 2012-03-23 | 1 | -1/+1 |
|/ | |||||
* | oops, forgot to commit the tests! :bomb: | Aaron Patterson | 2012-03-23 | 1 | -0/+67 |
| | |||||
* | chdir before globbing so that we don't need to escape directory names. | Aaron Patterson | 2012-03-23 | 1 | -1/+30 |
| | | | | fixes #5521 | ||||
* | Merge pull request #5550 from schneems/schneems/server_env | Aaron Patterson | 2012-03-23 | 4 | -0/+63 |
|\ | | | | | Fix environment support for rails server, and match interface of rails console | ||||
| * | match rails console environment support, to server | schneems | 2012-03-22 | 2 | -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 variable | schneems | 2012-03-20 | 2 | -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-refactor | José Valim | 2012-03-23 | 1 | -11/+11 |
|\ \ | | | | | | | Remove code duplication | ||||
| * | | Remove code duplication | Rafael Mendonça França | 2012-03-19 | 1 | -11/+11 |
| | | | |||||
* | | | Merge pull request #5556 from rafaelfranca/remove-warning | Piotr Sarnacki | 2012-03-23 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | use the new scope syntax on the tests to avoid DEPRECATION WARNINGS. | ||||
| * | | | Use the new scope syntax | Rafael Mendonça França | 2012-03-23 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #5374 from ↵ | José Valim | 2012-03-23 | 2 | -28/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | nertzy/remove_deprecated_partial_path_from_active_model_naming Remove ActiveModel::Naming#partial_path | ||||
| * | | | Remove ActiveModel::Naming#partial_path | Grant Hutchins | 2012-03-10 | 2 | -28/+1 |
| | | | | | | | | | | | | It was deprecated in 3.2 | ||||
* | | | | Fix tests, when creating rescue handler, we need to check for arity now | Piotr Sarnacki | 2012-03-23 | 1 | -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/master | Piotr Sarnacki | 2012-03-23 | 2 | -4/+5 |
|\ \ \ \ | | | | | | | | | | | Fixed missing space bug introduces in rails/rails@9299bfd | ||||
| * | | | | Fixed missing space bug introduces in ↵ | Anton Lindqvist | 2012-03-22 | 2 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | rails/rails@9299bfdcd387253d83b645c205b8df477f2d0940. | ||||
* | | | | | properly namespace the fixture exception | Aaron Patterson | 2012-03-22 | 2 | -7/+3 |
| | | | | | |||||
* | | | | | Merge pull request #5552 from lest/patch-3 | Aaron Patterson | 2012-03-22 | 3 | -6/+11 |
|\ \ \ \ \ | |/ / / / |/| | | | | deprecate Proc#bind that can cause symbol memory leak | ||||
| * | | | | deprecate Proc#bind that can cause symbol memory leak | Sergey Nartimov | 2012-03-22 | 3 | -6/+11 |
|/ / / / | |||||
* | | | | Merge pull request #5540 from mhfs/another_blank_line_fix | Piotr Sarnacki | 2012-03-21 | 2 | -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 Silveira | 2012-03-21 | 2 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | @spastorino request | ||||
* | | | | | remove duplicate requires. thanks @atambo | Aaron Patterson | 2012-03-21 | 1 | -1/+0 |
| | | | | | |||||
* | | | | | evented listeners can subscribe to any message | Aaron Patterson | 2012-03-21 | 1 | -9/+27 |
| | | | | | |||||
* | | | | | evented subscribers work | Aaron Patterson | 2012-03-21 | 1 | -6/+10 |
| | | | | | |||||
* | | | | | start / finish events are sent by the instrumenter | Aaron Patterson | 2012-03-21 | 2 | -7/+41 |
| | | | | | |||||
* | | | | | push the autoloads up to requires | Aaron Patterson | 2012-03-21 | 1 | -4/+4 |
|/ / / / | |||||
* | | | | Deprecate eager-evaluated scopes. | Jon Leighton | 2012-03-21 | 20 | -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 thing | Jon Leighton | 2012-03-21 | 1 | -2/+2 |
| | | | | |||||
* | | | | Remove valid_scope_name? check - use ruby | Jon Leighton | 2012-03-21 | 2 | -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 cast | Jon Leighton | 2012-03-21 | 1 | -1/+0 |
| | | | | |||||
* | | | | no need for lvar | Jon Leighton | 2012-03-21 | 1 | -3/+1 |
| | | | | |||||
* | | | | split subscribers based on pattern type | Aaron Patterson | 2012-03-21 | 1 | -13/+31 |
| | | | | |||||
* | | | | Merge pull request #5532 from mhfs/migration_blank_line | José Valim | 2012-03-21 | 2 | -1/+2 |
|\ \ \ \ | | | | | | | | | | | Remove blank line from generated migration | ||||
| * | | | | Remove blank line from generated migration | Marcelo Silveira | 2012-03-20 | 2 | -1/+2 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #5522 from ↵ | José Valim | 2012-03-21 | 2 | -0/+21 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | travisjeffery/fix_migration_generator_adding_removing_index Fix adding/removing field's index when generating migration | ||||
| * | | | Generate Migration Thats Adds Removed Index | Travis Jeffery | 2012-03-21 | 2 | -0/+21 |
|/ / / | | | | | | | | | | | | | When generating a migration that removes a field with an index, the down will add both the field and its index. | ||||
* | | | We dont need to merge in the parameters as thats all being reset by the rack ↵ | David Heinemeier Hansson | 2012-03-20 | 1 | -1/+0 |
| | | | | | | | | | | | | headers (and its causing problems for Strong Parameters attempt of wrapping request.parameters because it will change in testing) | ||||
* | | | probably should require the objects we monkey patch. | Aaron Patterson | 2012-03-20 | 1 | -0/+1 |
| | | | |||||
* | | | search private and protected methods for convert_key | Aaron Patterson | 2012-03-20 | 2 | -3/+3 |
| | | | |||||
* | | | bigdecimal can be duped on Ruby 2.0 | Aaron Patterson | 2012-03-20 | 2 | -2/+22 |
| | | | |||||
* | | | guides location has changed [ci skip] | Vijay Dev | 2012-03-20 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #5524 from kennyj/add_missing_require | Xavier Noria | 2012-03-20 | 1 | -0/+1 |
|\ \ \ | |_|/ |/| | | Add missing require | ||||
| * | | Add missing require | kennyj | 2012-03-20 | 1 | -0/+1 |
|/ / | |||||
* | | Merge pull request #5515 from rafaelfranca/remove-exclude | José Valim | 2012-03-19 | 2 | -14/+29 |
|\ \ | | | | | | | Remove exclude option from ActionDispatch::SSL and fix secure cookies | ||||
| * | | Fix secure cookies when there are more than one space before the secure | Rafael Mendonça França | 2012-03-19 | 2 | -1/+29 |
| | | | | | | | | | | | | keyword | ||||
| * | | Remove exclude option from ActionDispatch::SSL | Rafael Mendonça França | 2012-03-19 | 2 | -13/+0 |
|/ / | |||||
* | | Merge pull request #5503 from jeyb/leap_day_time_date_time_selector | Andrew White | 2012-03-19 | 3 | -13/+27 |
|\ \ | | | | | | | Fixes issue #5222: DateTimeSelector builds invalid dates on leap days | ||||
| * | | Fixes issue #5222: DateTimeSelector builds invalid dates on leap day when ↵ | Jey Balachandran | 2012-03-18 | 3 | -13/+27 |
| | | | | | | | | | | | | discarding both day and month. |