| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | Merge branch '4-1-0-beta2' | Rafael Mendonça França | 2014-02-18 | 1 | -1/+1 | |
| |\ | | | | | | | | | | | Conflicts: actionview/CHANGELOG.md activerecord/CHANGELOG.md | |||||
| | * | Preparing for 4.1.0.beta2 release | Rafael Mendonça França | 2014-02-18 | 1 | -1/+1 | |
| | | | ||||||
| * | | `#to_param` returns `nil` if `to_key` returns `nil`. Closes #11399. | Yves Senn | 2014-02-04 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation of `#to_key` (http://api.rubyonrails.org/classes/ActiveModel/Conversion.html#method-i-to_key) states that it returns `nil` if there are no key attributes. `to_param` needs to be aware of that fact and return `nil` as well. Previously it raised the following exception: ``` 1) Error: ConversionTest#test_to_param_returns_nil_if_to_key_is_nil: NoMethodError: undefined method `join' for nil:NilClass /Users/senny/Projects/rails/activemodel/lib/active_model/conversion.rb:65:in `to_param' /Users/senny/Projects/rails/activemodel/test/cases/conversion_test.rb:34:in `block in <class:ConversionTest>' ``` | |||||
| * | | Fix doc markup of clear_validators! | Carlos Antonio da Silva | 2014-01-27 | 1 | -2/+2 | |
| | | | ||||||
| * | | Ability to specify multiple contexts when defining a validation. | Vince Puzzella | 2014-01-27 | 1 | -5/+9 | |
| | | | | | | | | | | | | | Example: validates_presence_of :name, on: [:update, :custom_validation_context] | |||||
| * | | revises references to :allow_(nil|blank) in some docs [ci skip] [Steven Yang ↵ | Xavier Noria | 2014-01-26 | 10 | -26/+12 | |
| | | | | | | | | | | | | | & Xavier Noria] Closes #11247. | |||||
| * | | Some minor fixes | Godfrey Chan | 2014-01-24 | 1 | -2/+2 | |
| | | | ||||||
| * | | Got all the new tests passing | Godfrey Chan | 2014-01-24 | 1 | -10/+8 | |
| | | | ||||||
| * | | Restored the ability to clear the password with user.password= nil (see the ↵ | Godfrey Chan | 2014-01-24 | 1 | -1/+3 | |
| | | | | | | | | | docs) | |||||
| * | | Fix ActiveModel::Errors#has_key? return value | Adrien Coquio | 2014-01-22 | 1 | -1/+1 | |
| | | | ||||||
| * | | Forgot to push this change in the parent commit | Rafael Mendonça França | 2014-01-20 | 1 | -1/+1 | |
| | | | ||||||
| * | | When applying changes or reseting changes create the right class | Rafael Mendonça França | 2014-01-20 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | Before this patch after the changes are applied the changes can be only accessed using string keys, but before symbols are also accepted. After this change every state of the model will be consistent. | |||||
| * | | Fix eager load of Serializers on Active Model | Carlos Antonio da Silva | 2014-01-17 | 1 | -2/+2 | |
| | | | ||||||
| * | | doc proc/lambda arg on inclusion validation. Closes #13689. [ci skip] | Yves Senn | 2014-01-13 | 1 | -1/+2 | |
| | | | ||||||
| * | | Use a better method name to check the requirement of password confirmation | Carlos Antonio da Silva | 2014-01-07 | 1 | -5/+5 | |
| | | | | | | | | | | | Also improve changelog entries related to secure password to proper highlight. | |||||
| * | | Fix typo in AMo docs [ci skip] | Carlos Antonio da Silva | 2014-01-06 | 1 | -1/+1 | |
| | | | ||||||
| * | | Change all "can not"s to the correct "cannot". | T.J. Schuck | 2014-01-03 | 1 | -20/+20 | |
| | | | ||||||
| * | | update copyright notices to 2014. [ci skip] | Vipul A M | 2014-01-01 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-12-31 | 4 | -5/+5 | |
| |\ \ | ||||||
| | * | | Fix few typos and improve markup at some levels | Robin Dupret | 2013-12-24 | 4 | -5/+5 | |
| | | | | ||||||
| * | | | Merge pull request #13131 from gja/changed-accepts-values | Godfrey Chan | 2013-12-30 | 1 | -2/+6 | |
| |\ \ \ | | | | | | | | | Allows you to check if a field has changed to a particular value | |||||
| | * | | | Allows you to check if an attribute has changed to a particular value | Tejas Dinkar | 2013-12-15 | 1 | -2/+6 | |
| | | | | | | | | | | | | | | | | | model.name_changed?(from: "Pete", to: "Ringo") | |||||
| * | | | | Merge pull request #13483 from aditya-kapoor/add-missing-slashes | Yves Senn | 2013-12-27 | 6 | -6/+6 | |
| |\ \ \ \ | | | | | | | | | | | Adding missing backslashes in active_model files so as to avoid unwanted [ci skip] | |||||
| | * | | | | Adding missing backslashes in active_model files so as to avoid unwanted ↵ | aditya-kapoor | 2013-12-27 | 6 | -6/+6 | |
| | | | | | | | | | | | | | | | | | | | | | links in rdoc [ci skip] | |||||
| * | | | | | Added Backslashes to ActiveModel::AttributeMethods to prevent unwanted links ↵ | aditya-kapoor | 2013-12-25 | 1 | -16/+11 | |
| |/ / / / | | | | | | | | | | | | | in the rdoc + some other doc fixes.[ci skip] | |||||
| * | / / | Fix few typos in the documentation [ci skip] | Robin Dupret | 2013-12-21 | 1 | -1/+1 | |
| | |/ / |/| | | ||||||
| * | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-12-20 | 2 | -2/+2 | |
| |\ \ \ | |_|/ |/| | | ||||||
| | * | | Merge branch 'master' of github.com:lifo/docrails | aditya-kapoor | 2013-12-10 | 7 | -58/+86 | |
| | |\ \ | ||||||
| | | * | | Typos. return -> returns. [ci skip] | Lauro Caetano | 2013-12-03 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Merge branch 'master' of github.com:lifo/docrails | aditya-kapoor | 2013-09-01 | 1 | -1/+3 | |
| | |\ \ \ | ||||||
| | * | | | | fixed a typo | aditya-kapoor | 2013-08-20 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Get ready to release 4.1.0.beta1 | David Heinemeier Hansson | 2013-12-17 | 1 | -1/+1 | |
| | |_|_|/ |/| | | | ||||||
| * | | | | Fix typo [ci skip] | Rafael Mendonça França | 2013-12-13 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Added :nodoc: for `attribute_changed?` and `attribute_was` [ci skip] | Godfrey Chan | 2013-12-12 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | These methods were made "public" in 47617ecd so that `method_missing` can invoke them without going through `send`, but they aren't meant for consumption from outside of Rails. | |||||
| * | | | | Spelling and Grammar checks | Akshay Vishnoi | 2013-12-12 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | typos rectified lifecycle => life cycle | Aayush khandelwal | 2013-12-12 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge pull request #13145 from acapilleri/fix_email_example | Carlos Antonio da Silva | 2013-12-03 | 1 | -1/+1 | |
| |\ \ \ \ | | | | | | | | | | | fix email regex example code [ci skip] | |||||
| | * | | | | fix email regex example code [ci skip] | Angelo capilleri | 2013-12-03 | 1 | -1/+1 | |
| | | |_|/ | |/| | | | | | | | | | | different from the regex in EmailValidator | |||||
| * | | | | Remove deprecated cattr_* requires | Genadi Samokovarov | 2013-12-03 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Typo and grammatical fixes [ci skip] | Akshay Vishnoi | 2013-12-02 | 1 | -1/+1 | |
| |/ / / | ||||||
| * | | | Merge remote-tracking branch 'docrails/master' | Xavier Noria | 2013-11-24 | 1 | -6/+6 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/deep_merge.rb activesupport/lib/active_support/core_ext/hash/keys.rb | |||||
| | * | | | Change syntax format for example returned values | Prem Sichanugrist | 2013-11-11 | 1 | -6/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to our guideline, we leave 1 space between `#` and `=>`, so we want `# =>` instead of `#=>`. Thanks to @fxn for the suggestion. [ci skip] | |||||
| * | | | | Remove short circuit return in favor of simple conditional | Carlos Antonio da Silva | 2013-11-15 | 1 | -4/+7 | |
| | | | | | ||||||
| * | | | | Invert conditional to avoid double checking for Regexp | Carlos Antonio da Silva | 2013-11-15 | 1 | -11/+12 | |
| | | | | | ||||||
| * | | | | Only check that the option exists once instead of doing on each conditional | Carlos Antonio da Silva | 2013-11-15 | 1 | -8/+9 | |
| | | | | | ||||||
| * | | | | Remove argument that is accessible as attribute | Carlos Antonio da Silva | 2013-11-15 | 1 | -3/+3 | |
| | | | | | ||||||
| * | | | | Cache regexp source on format validation to avoid allocating new objects | Carlos Antonio da Silva | 2013-11-15 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: >> r = /some-regexp/ => /some-regexp/ >> r.source.object_id == r.source.object_id => false | |||||
| * | | | | Make code simpler to read by using a case statement | Carlos Antonio da Silva | 2013-11-15 | 1 | -2/+6 | |
| | | | | | ||||||
| * | | | | Avoid a new hash allocation | Carlos Antonio da Silva | 2013-11-15 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Use a simple conditional rather than short circuit with next | Carlos Antonio da Silva | 2013-11-15 | 1 | -2/+3 | |
| | | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |