Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | String#titleize works properly with smart quotes, closes #5584 | Vasiliy Ermolovich | 2012-03-26 | 2 | -3/+7 |
| | |||||
* | Merge pull request #5183 from lest/patch-1 | José Valim | 2012-03-26 | 1 | -2/+3 |
|\ | | | | | use content_tag in button_to helper | ||||
| * | use content_tag in button_to helper | Sergey Nartimov | 2012-03-14 | 1 | -2/+3 |
| | | |||||
* | | Merge pull request #5581 from jamie/custom_param_field | José Valim | 2012-03-26 | 2 | -4/+23 |
|\ \ | | | | | | | Allow a defining custom member field on resources | ||||
| * | | Allow a defining custom member field on resources | Jamie Macey | 2012-03-25 | 2 | -4/+23 |
|/ / | | | | | | | | | | | | | | | | | | | By default, resources routes are created with :resource/:id. A model defining to_param can make prettier urls by using something more readable than an integer ID, but since the route picks it up as :id you wind up with awkward User.find_by_username(params[:id]) calls. By overriding the key to be used in @request.params you can be more obvious in your intent. | ||||
* | | Merge pull request #5575 from phiggins/remove_conditional_from_statistics_task | Xavier Noria | 2012-03-25 | 1 | -7/+1 |
|\ \ | | | | | | | Remove useless conditional. | ||||
| * | | Remove useless conditional. | Pete Higgins | 2012-03-25 | 1 | -7/+1 |
|/ / | |||||
* | | restores example depicting the use of true or false in regular font | Xavier Noria | 2012-03-25 | 1 | -0/+14 |
| | | | | | | | | | | There was an example here that mentioned reload_plugins? but it was deleted. This commit puts another example back. | ||||
* | | Merge pull request #5566 from lest/patch-3 | Piotr Sarnacki | 2012-03-25 | 2 | -0/+13 |
|\ \ | | | | | | | fix HashWithIndifferentAccess.[] method | ||||
| * | | fix HashWithIndifferentAccess.[] method | Sergey Nartimov | 2012-03-23 | 2 | -0/+13 |
| | | | |||||
* | | | Merge pull request #5570 from avakhov/ac-caching-split | Jeremy Kemper | 2012-03-24 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | ActionController caching small String#split optimization | ||||
| * | | | ActionController caching small String#split optimization | Alexey Vakhov | 2012-03-24 | 1 | -2/+2 |
| | | | | |||||
* | | | | Revert "Return an actual boolean from xml_http_request?" | Xavier Noria | 2012-03-25 | 1 | -1/+1 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reason: This commit changes code that was committed some year and a half ago. The original code is an ordinary predicate that delegates straight to a boolean operator with no further unnecessaru adorments, as clearly explained in #5329. This change also may confuse users who may now believe they can rely now on singletons, while predicates in Rails rely on standard Ruby semantics for boolean values and guarantee no singletons whatsover. This reverts commit 6349791d5aaf652631b29f1371701fc2985fda83. | ||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-03-24 | 13 | -99/+133 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: guides/source/ruby_on_rails_guides_guidelines.textile | ||||
| * | | | spacing fix in guide [ci skip] | Vijay Dev | 2012-03-24 | 1 | -1/+1 |
| | | | | |||||
| * | | | [getting started][ci skip] fix link to the code | Fabián Rodríguez | 2012-03-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | :foreign_key option should be on has_many side of association | Mikhail Dieterle | 2012-03-23 | 1 | -2/+2 |
| | | | | |||||
| * | | | Adding documentation for ActiveRecord::Base.abstract_class to clarify a ↵ | Joe Goggins | 2012-03-22 | 1 | -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 ↵ | adman65 | 2012-03-22 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | affects | ||||
| * | | | [engines] [ci-skip] Add example of precompiling engine assets | adman65 | 2012-03-22 | 1 | -0/+15 |
| | | | | |||||
| * | | | improvements in "caching_with_rails" guide | kucaahbe | 2012-03-22 | 1 | -8/+10 |
| | | | | |||||
| * | | | Fixed-width font fix for instance variable | Juanjo Bazán | 2012-03-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | [ci skip] Make guides more readable & consistent | Mark D. Blackwell | 2012-03-20 | 3 | -82/+83 |
| | | | | |||||
| * | | | Correct description of ['migrated_at > ?', 1.week.ago] from "more than a ↵ | Dave Burt | 2012-03-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | week ago" to "more recently than a week ago." | ||||
| * | | | Merge branch 'master' of github.com:lifo/docrails | Charles Brian Quinn | 2012-03-19 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Adding comma to correct syntax in comment. | Jesse Brown | 2012-03-19 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Updates ActionMailer Base summary and fixes space in code example. | Charles Brian Quinn | 2012-03-19 | 1 | -4/+4 |
| |/ / / | |||||
* | | | | 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 |