| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | Remove warning added by my own commit :fire: | Carlos Antonio da Silva | 2012-03-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Commit: 7a0cf2f5294e8bcef547642435636b394340a3e4 | |||||
| | * | | | | | 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 | |||||
| | * | | | | | | 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 | |||||
| | * | | | | | | 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 | |||||
| | * | | | | | | | Properly deprecate the block argument in AV FormBuilder | Carlos Antonio da Silva | 2012-03-23 | 2 | -3/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 56089ca986c767763f29159c8de0aa1ebabfd4d2 introduced a backward incompatible change by changing the method signature of the FormBuilder. This brings back the same method signature warning in case someone gives a block to the builder. More info: https://github.com/rails/rails/commit/56089ca986c767763f29159c8de0aa1ebabfd4d2#commitcomment-1116166 | |||||
| * | | | | | | | | 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 | |||||
| | * | | | | | | | | 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 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes #2737 Conflicts: activerecord/lib/active_record/coders/yaml_column.rb | |||||
| * | | | | | | | | | 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 | |||||
| | * | | | | | | | | 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 ↵ | Aaron Patterson | 2012-03-26 | 2 | -12/+17 | |
| |\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | lukesarnacki/activemodel_name_composition_over_inheritance ActiveModel::Name does not inherit from string | |||||
| | * | | | | | | | | 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 | |||||
| | * | | | | | | | | 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? | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |