| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | 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 | |
| | | | | | ||||||
| * | | | | Simplify number parsing logic in numericality validation | Carlos Antonio da Silva | 2013-11-15 | 1 | -10/+3 | |
| | | | | | ||||||
| * | | | | Avoid creation of extra hash with merge just to set a value | Carlos Antonio da Silva | 2013-11-15 | 1 | -1/+3 | |
| |/ / / | ||||||
| * | | | Merge pull request #12686 from kryzhovnik/master | Carlos Antonio da Silva | 2013-11-02 | 1 | -6/+6 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Minor doc fix of ActiveModel::Naming. [ci skip] Conflicts: activemodel/lib/active_model/naming.rb | |||||
| | * | | | Minor doc fix of ActiveModel::Naming. | Andrey Samsonov | 2013-10-29 | 1 | -6/+6 | |
| | | | | | | | | | | | | | | | | | | | | | - qoute example line's result when it kind of String - right ("singular_route_key") method in example | |||||
| * | | | | Merge pull request #12635 from mperham/4-0-stable | Guillermo Iguaran | 2013-10-24 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | Allow any version of BCrypt | |||||
| * | | | | Let validates_inclusion_of accept Time and DateTime ranges | Akira Matsuda | 2013-10-23 | 1 | -5/+11 | |
| | | | | | | | | | | | | | | | | | fixes 4.0.0 regression introduced in 0317b93c17a46d7663a8c36edc26ad0ba3d75f85 | |||||
| * | | | | Use bcrypt's public cost attr, not internal constant | T.J. Schuck | 2013-10-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See: - https://github.com/codahale/bcrypt-ruby/pull/63 - https://github.com/codahale/bcrypt-ruby/pull/64 - https://github.com/codahale/bcrypt-ruby/pull/65 | |||||
| * | | | | Merge pull request #8791 from griffinmyers/master | Rafael Mendonça França | 2013-10-03 | 1 | -1/+1 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated DirtyModel's @changed_attributes hash to be symbol/string agnostic Conflicts: activemodel/CHANGELOG.md | |||||
| | * | | | | DirtyModel uses a hash to keep track of any changes made to attributes | William Myers | 2013-05-27 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of an instance. When using the attribute_will_change! method, you must supply a string and not a symbol or the *_changed? method will break (because it is looking for the attribute name as a string in the keys of the underlying hash). To remedy this, I simply made the underlying hash a HashWithIndifferentAccess so it won't matter if you supply the attribute name as a symbol or string to attribute_will_change!. | |||||
| * | | | | | bcrypt-ruby v3.1.2 supports Ruby 2.0 on Windows | T.J. Schuck | 2013-09-23 | 1 | -3/+3 | |
| | | | | | | ||||||
| * | | | | | Fix the documentation method. | Rafael Mendonça França | 2013-09-23 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is reload! in the class definition. [ci skip] | |||||
| * | | | | | Document reset_changes since it is part of public API | Rafael Mendonça França | 2013-09-23 | 1 | -0/+12 | |
| | | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
| * | | | | | Merge pull request #10816 from bogdan/less-dirty-dirty | Rafael Mendonça França | 2013-09-23 | 1 | -10/+16 | |
| | |_|_|/ |/| | | | | | | | | | | | Make AM::Dirty less dirty to plugin into AR or other library | |||||
| * | | | | Add :nodoc: to ActiveModel::SecurePassword.min_cost | Gaurish Sharma | 2013-08-29 | 1 | -1/+3 | |
| | |_|/ |/| | | | | | | | | [ci skip] | |||||
| * | | | Fix: documentation for ActiveModel::Errors | Ryoji Yoshioka | 2013-08-05 | 1 | -4/+4 | |
| | | | | ||||||
| * | | | Fix secure_password password_confirmation validations | Vladimir Kiselev | 2013-07-24 | 1 | -2/+8 | |
| | | | | ||||||
| * | | | bcrypt-ruby stable is 3.1 | Burkhard Vogel-Kreykenbohm | 2013-07-17 | 1 | -3/+3 | |
| | | | | ||||||
| * | | | it's xml, not json | John Gesimondo | 2013-07-13 | 1 | -1/+1 | |
| | | | | | | | | | | change docs for xml serializer to talk about xml | |||||
| * | | | eagerly initialize the attributes module to avoid check-then-set race conditions | Aaron Patterson | 2013-07-02 | 1 | -1/+4 | |
| | | | | ||||||
| * | | | remove wrong documentation from a :nodoc:'d method | Aaron Patterson | 2013-07-02 | 1 | -1/+0 | |
| | | | | ||||||
| * | | | the data structure used to store attribute aliases should not be exposed | Aaron Patterson | 2013-07-01 | 1 | -0/+10 | |
| | | | | ||||||
| * | | | fix typo in ActiveModel::Error docs [ci skip] | Steven Yang | 2013-06-30 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | remove evals from AM::Validations::Callbacks | Steven Yang | 2013-06-30 | 1 | -1/+3 | |
| | | | | | | | | | | | | | follow the same refactor at a63a964a5d1ed02cf0df1b1a33a96ed2a9fa987b | |||||
| * | | | provide a more sementicthe local variables name for ↵ | Steven Yang | 2013-06-29 | 1 | -8/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | ActiveModel::Validations::Clusivity#include? method the original name `exclusion` is a bit confusing when using with the method `inclusion_method` rename it to a more logic neutral name. | |||||
| * | | | Remove deprecation warning from AttributeMethodsMatcher | Paul Nikitochkin | 2013-06-28 | 1 | -8/+0 | |
| | | | | ||||||
| * | | | Remove deprecated attr_protected/accessible | Łukasz Strzałkowski | 2013-06-27 | 2 | -22/+0 | |
| | | | | | | | | | | | | | Rails 4.0 has removed attr_protected and attr_accessible feature in favor of Strong Parameters. | |||||
| * | | | Merge pull request #11054 from senny/11048_make_default_value_explicit | Carlos Antonio da Silva | 2013-06-27 | 1 | -4/+2 | |
| |\ \ \ | | | | | | | | | make default value for `:message` on `AM::Errors` explicit. | |||||
| | * | | | make default value for `:message` on `AM::Errors` explicit. | Yves Senn | 2013-06-22 | 1 | -4/+2 | |
| | | | | | ||||||
| * | | | | Merge pull request #10774 from ↵ | Carlos Antonio da Silva | 2013-06-25 | 2 | -4/+5 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | chuckbergeron/validates-inclusion-of-accuracy-for-non-numeric-ranges Greater accuracy for validates_inclusion_of on non-numeric ranges Closes #10774, fixes #10593 | |||||
| | * | | | | Use Range#cover? for Numeric ranges (tests via endpoints) and use ↵ | Charles Bergeron | 2013-05-27 | 2 | -4/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Range#include? for non-numeric ranges added changelog message | |||||
| * | | | | | Fixing Issue #11083 | Akshay Khole | 2013-06-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | Removing other occurrences of `the` appearing twice | |||||
| * | | | | | Revert "Merge pull request #11053 from yangchenyun/mine" | José Valim | 2013-06-22 | 1 | -2/+0 | |
| | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Those two files are required by active_support/rails.rb loaded in active_model.rb It is common to require common dependencies on the root files to avoid boilerplate in each file. This reverts commit 763635e30f17800ebc0a8ae98d780edc8ebfb4e5, reversing changes made to 4f46ef36aaef217834f3f96d3689d32f6a6761ea. | |||||
| * | | | | Merge pull request #11053 from yangchenyun/mine | Yves Senn | 2013-06-22 | 1 | -0/+2 | |
| |\ \ \ \ | | | | | | | | | | | Add explicit dependencies of ActiveSupport to enable independent usage of ActiveModel::Name | |||||
| | * | | | | add explicit AS dependencies for ActiveModel::Naming | Steven Yang | 2013-06-22 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two missing ActiveSupport dependencies to use ActiveModel::Name class or ActiveModel::Naming module independently. Missing dependencies for Module#delegate defined in `active_support/core_ext/module/delegation`, used at [L148](https://github.com/rails/rails/blob/master/activemodel/lib/active_model/naming.rb#L148) Missing dependencies for Object#blank? defined in `active_support/core_ext/object/blank`, used at [L131](https://github.com/rails/rails/blob/master/activemodel/lib/active_model/naming.rb#L131) | |||||
| * | | | | | ActiveModel::Model inclusion chain backward compatibility | Fred Wu | 2013-06-20 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Fixes AciveModel::Model with no ancestors, fixes #11004 | Fred Wu | 2013-06-19 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@plataformatec.com.br> | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |