David Heinemeier Hansson
c0a2d474c5
Get ready to release 4.1.0.beta1
2013-12-17 16:05:28 -08:00
Rafael Mendonça França
12affbe491
Fix typo [ci skip]
2013-12-13 18:33:30 -02:00
Rafael Mendonça França
b34352e425
Merge pull request #13255 from strzalek/bump-builder
...
Bump up builder
2013-12-12 12:22:21 -08:00
Godfrey Chan
f650981483
Added :nodoc: for attribute_changed?
and attribute_was
[ci skip]
...
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.
2013-12-12 12:04:07 -08:00
Łukasz Strzałkowski
9f506c494b
More liberal builder dependency
...
Allowing us to get 3.2.x versions if needed.
2013-12-12 20:03:02 +01:00
Akshay Vishnoi
5fccd77b6c
Spelling and Grammar checks
2013-12-12 18:28:34 +05:30
Yves Senn
6f3c3ba784
Merge pull request #13287 from aayushkhandelwal11/typo_rectified
...
typos rectified lifecycle => life cycle
2013-12-11 23:32:04 -08:00
Aayush khandelwal
10fffd7ae6
typos rectified lifecycle => life cycle
2013-12-12 12:55:35 +05:30
Rafael Mendonça França
5853c64a4b
Revert "Merge pull request #13276 from aayushkhandelwal11/change_to_key"
...
This will call primary_key two times
This reverts commit d0588a2e897d33c6c12e9fc5f8680328d37a26ca, reversing
changes made to 87e1e86640fb8b5a260ff7c0044aaae58fff2bc4.
2013-12-11 13:43:28 -02:00
Rafael Mendonça França
d0588a2e89
Merge pull request #13276 from aayushkhandelwal11/change_to_key
...
removing multiple check conditions to single check condition
2013-12-11 06:22:42 -08:00
Aayush khandelwal
1889dcbc9f
removing multiple check conditions to single check condition
2013-12-11 19:36:25 +05:30
Guillermo Iguaran
87e1e86640
Merge pull request #13273 from robertomiranda/test-remove-require
...
Remove require 'models/administrator', Administrator is not used in secure password test
2013-12-11 05:39:14 -08:00
robertomiranda
df7e5b69de
Remove require 'models/administrator', Administrator is not used in secure password test
2013-12-11 08:34:28 -05:00
Carlos Antonio da Silva
05a685eeb7
Merge pull request #13145 from acapilleri/fix_email_example
...
fix email regex example code [ci skip]
2013-12-03 07:47:25 -08:00
Angelo capilleri
f590cdb656
fix email regex example code [ci skip]
...
different from the regex in EmailValidator
2013-12-03 16:44:39 +01:00
Genadi Samokovarov
6329d9fa8b
Remove deprecated cattr_* requires
2013-12-03 00:28:15 +02:00
Akshay Vishnoi
ef0f633c66
Typo and grammatical fixes [ci skip]
2013-12-02 19:35:02 +05:30
Yves Senn
7c6d99e81e
first pass through CHANGELOGS to extract 4_1_release_notes. [ci skip]
...
Extract **notable changes**, **deprecations** and **removals** from
each CHANGELOG.
I tried to reference the commits and pull requests for new features
and deprecations.
In the process I also made some minor changes to the CHANGELOGS.
The 4_1_release_notes guide is declared WIP.
2013-11-28 17:24:15 +01:00
Xavier Noria
17c29a0df0
Merge remote-tracking branch 'docrails/master'
...
Conflicts:
activesupport/lib/active_support/core_ext/hash/deep_merge.rb
activesupport/lib/active_support/core_ext/hash/keys.rb
2013-11-24 20:00:24 +01:00
Carlos Antonio da Silva
aa7fdfb859
Remove short circuit return in favor of simple conditional
2013-11-15 01:11:57 -02:00
Carlos Antonio da Silva
374d465f28
Invert conditional to avoid double checking for Regexp
2013-11-15 01:04:57 -02:00
Carlos Antonio da Silva
9014a79436
Only check that the option exists once instead of doing on each conditional
2013-11-15 01:01:59 -02:00
Carlos Antonio da Silva
61fef76106
Remove argument that is accessible as attribute
2013-11-15 01:00:53 -02:00
Carlos Antonio da Silva
b8c6c08452
Cache regexp source on format validation to avoid allocating new objects
...
Example:
>> r = /some-regexp/
=> /some-regexp/
>> r.source.object_id == r.source.object_id
=> false
2013-11-15 00:38:55 -02:00
Carlos Antonio da Silva
70161ae3b8
Make code simpler to read by using a case statement
2013-11-15 00:24:54 -02:00
Carlos Antonio da Silva
12815e0d44
Avoid a new hash allocation
2013-11-15 00:24:54 -02:00
Carlos Antonio da Silva
4c7e3a3087
Use a simple conditional rather than short circuit with next
2013-11-15 00:19:03 -02:00
Carlos Antonio da Silva
d2992818e0
Simplify number parsing logic in numericality validation
2013-11-15 00:07:22 -02:00
Carlos Antonio da Silva
f70e30ec6d
Avoid creation of extra hash with merge just to set a value
2013-11-15 00:07:22 -02:00
Prem Sichanugrist
efff6c1fd4
Change syntax format for example returned values
...
According to our guideline, we leave 1 space between `#` and `=>`, so we
want `# =>` instead of `#=>`.
Thanks to @fxn for the suggestion.
[ci skip]
2013-11-11 13:53:54 -05:00
Carlos Antonio da Silva
deaf285824
Merge pull request #12686 from kryzhovnik/master
...
Minor doc fix of ActiveModel::Naming. [ci skip]
Conflicts:
activemodel/lib/active_model/naming.rb
2013-11-02 14:46:56 -02:00
Andrey Samsonov
fb6f02c521
Minor doc fix of ActiveModel::Naming.
...
- qoute example line's result when it kind of String
- right ("singular_route_key") method in example
2013-10-29 15:23:03 +04:00
Guillermo Iguaran
c31b900221
Merge pull request #12635 from mperham/4-0-stable
...
Allow any version of BCrypt
2013-10-24 19:31:13 -02:00
Akira Matsuda
68db6bc431
Let validates_inclusion_of accept Time and DateTime ranges
...
fixes 4.0.0 regression introduced in 0317b93c17a46d7663a8c36edc26ad0ba3d75f85
2013-10-23 22:10:15 +09:00
T.J. Schuck
5d7b413d84
Use bcrypt's public cost attr, not internal constant
...
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
2013-10-10 11:46:59 -04:00
Arun Agrawal
31488dba85
observers are not part of ActiveModel [ci skip]
2013-10-09 14:25:16 +02:00
Vijay Ubuntu
27576df810
adding load_path to include active_model in the load path of example
...
similar to activerecord/examples/simple.rb
2013-10-09 01:52:55 +05:30
Rafael Mendonça França
c48c111bb2
Merge pull request #8791 from griffinmyers/master
...
Updated DirtyModel's @changed_attributes hash to be symbol/string agnostic
Conflicts:
activemodel/CHANGELOG.md
2013-10-03 11:37:10 -03:00
T.J. Schuck
4a99e10199
bcrypt-ruby v3.1.2 supports Ruby 2.0 on Windows
2013-09-23 14:28:26 -04:00
Rafael Mendonça França
ed0b080cb3
Fix the documentation method.
...
It is reload! in the class definition.
[ci skip]
2013-09-23 11:25:43 -03:00
Rafael Mendonça França
7ef29140eb
No need to abbreviate ActiveModel
...
[ci skip]
2013-09-23 11:01:43 -03:00
Rafael Mendonça França
089e1b6426
Document reset_changes since it is part of public API
...
[ci skip]
2013-09-23 11:00:56 -03:00
Rafael Mendonça França
9aa1a3d853
Merge pull request #10816 from bogdan/less-dirty-dirty
...
Make AM::Dirty less dirty to plugin into AR or other library
2013-09-23 10:59:05 -03:00
Rajarshi Das
782d794c20
use assert_empty in activemodel conditional validation test cases
2013-09-10 17:26:39 +05:30
Rajarshi Das
e21a18bed0
fix actionview and activemodel test cases typos
2013-09-05 14:21:57 +05:30
Gaurish Sharma
65f1766a08
Add :nodoc: to ActiveModel::SecurePassword.min_cost
...
[ci skip]
2013-08-29 01:27:18 +05:30
Rajarshi Das
9f478deaab
remove unused instance variable
2013-08-23 16:04:08 +05:30
Guillermo Iguaran
99e33c03b7
Dont' check for any order in hash since we aren't sorting it and this is determinated only by the used interpreter
2013-08-18 16:40:21 -05:00
Guillermo Iguaran
c40111c346
Refactor serialization test for hash order
2013-08-18 09:04:09 -05:00
Gaurish Sharma
90c450f6cd
Avoid Skip in test, have a unified test for order
2013-08-09 15:27:21 +05:30