Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #5609 from tjmcewan/master | José Valim | 2012-03-27 | 2 | -0/+2 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | change number_with_precision to not return negative zeros | Tim McEwan | 2012-03-27 | 2 | -0/+2 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #5582 from chendo/master | Xavier Noria | 2012-03-26 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Remove 'needless boolean casting'. | Jack Chen (chendo) | 2012-03-26 | 1 | -1/+1 | |
* | | | | | | favor composition over inheritance | Aaron Patterson | 2012-03-26 | 1 | -5/+20 | |
* | | | | | | Don't ignore non Enumerable values passed to sanitize (closes #5585) | Piotr Sarnacki | 2012-03-27 | 2 | -0/+29 | |
* | | | | | | favor composition over inheritance | Aaron Patterson | 2012-03-26 | 2 | -8/+30 | |
* | | | | | | Merge pull request #2621 from icco/master | Aaron Patterson | 2012-03-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Not checking for nil is apparently a lot faster. | Nat Welch | 2011-09-21 | 1 | -1/+1 | |
| * | | | | | | Merge branch 'master' of git://github.com/rails/rails | Nat Welch | 2011-09-21 | 349 | -3121/+6229 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | From @dasch's recommendation. | Nat Welch | 2011-08-22 | 1 | -1/+1 | |
| * | | | | | | | Fixes bug with schema dumper when using with Padrino. | Nat Welch | 2011-08-21 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #5601 from carlosantoniodasilva/cookie-store-session-hash | Aaron Patterson | 2012-03-26 | 2 | -2/+3 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Remove warning added by my own commit :fire: | Carlos Antonio da Silva | 2012-03-26 | 1 | -1/+1 | |
| * | | | | | | | | Return the same session data object when setting session id | Carlos Antonio da Silva | 2012-03-26 | 1 | -1/+2 | |
* | | | | | | | | | Merge pull request #5331 from castlerock/remove_unused_require | Aaron Patterson | 2012-03-26 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | remove unused require from AS/core_ext/class/delegating_att.rb | Vishnu Atrai | 2012-03-10 | 1 | -2/+0 | |
* | | | | | | | | | | still need to ensure the path is a directory | Aaron Patterson | 2012-03-26 | 1 | -1/+1 | |
* | | | | | | | | | | eliminating a branch we do not need. thanks @jeremy | Aaron Patterson | 2012-03-26 | 1 | -30/+3 | |
| |/ / / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | stop using *args in order to simplify our constructor | Aaron Patterson | 2012-03-26 | 1 | -5/+4 | |
* | | | | | | | | | Merge pull request #5592 from nashby/fix-issue-5584 | Piotr Sarnacki | 2012-03-26 | 2 | -3/+7 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | String#titleize works properly with smart quotes, closes #5584 | Vasiliy Ermolovich | 2012-03-26 | 2 | -3/+7 | |
* | | | | | | | | | | Merge pull request #5561 from carlosantoniodasilva/form-builder-block-arg | Aaron Patterson | 2012-03-26 | 2 | -3/+21 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Properly deprecate the block argument in AV FormBuilder | Carlos Antonio da Silva | 2012-03-23 | 2 | -3/+21 | |
* | | | | | | | | | | | Don't depend on ivars. Thanks @fesplugas | Aaron Patterson | 2012-03-26 | 1 | -1/+1 | |
* | | | | | | | | | | | Merge pull request #5594 from lest/patch-1 | Piotr Sarnacki | 2012-03-26 | 2 | -1/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | apply form_for namespace option to date_select | Sergey Nartimov | 2012-03-26 | 2 | -1/+12 | |
* | | | | | | | | | | | | ActiveRecord::Coders::YAMLColumn#dump should raise an error | Guten | 2012-03-26 | 2 | -1/+14 | |
* | | | | | | | | | | | | Merge pull request #5595 from guilleiguaran/sprockets-rails-1.0.0 | Aaron Patterson | 2012-03-26 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | sprockets-rails 1.0.0 was released, remove git dependency from Gemfile | Guillermo Iguaran | 2012-03-26 | 1 | -2/+0 | |
* | | | | | | | | | | | | no need to freeze things all the time | Aaron Patterson | 2012-03-26 | 1 | -8/+7 | |
* | | | | | | | | | | | | test against ruby features in order to fix tests on Ruby 2.0 | Aaron Patterson | 2012-03-26 | 1 | -1/+9 | |
* | | | | | | | | | | | | Merge pull request #5593 from lukesarnacki/activemodel_name_composition_over_... | Aaron Patterson | 2012-03-26 | 2 | -12/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | ActiveModel::Name does not inherit from string | Lukasz Sarnacki | 2012-03-26 | 2 | -12/+17 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #5183 from lest/patch-1 | José Valim | 2012-03-26 | 1 | -2/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | 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 | Jamie Macey | 2012-03-25 | 2 | -4/+23 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #5575 from phiggins/remove_conditional_from_statistics_task | Xavier Noria | 2012-03-25 | 1 | -7/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | 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 | |
* | | | | | | | | | | | Merge pull request #5566 from lest/patch-3 | Piotr Sarnacki | 2012-03-25 | 2 | -0/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | 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 | 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 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-03-24 | 13 | -99/+133 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | 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 |