TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
43,929 Commits 2 Branches 0 Tags 294 MiB
da83a6f126
Commit Graph

43929 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron Patterson
da83a6f126 make variable name more clear 2014-05-21 14:27:30 -07:00
Aaron Patterson
7bc25f0035 do not mutate parameters, let the caller do mutations 2014-05-21 14:27:30 -07:00
Aaron Patterson
620cb01676 push the formatter up to the Route object 2014-05-21 14:27:30 -07:00
Guillermo Iguaran
e17aead83c Merge pull request #15231 from khusnetdinov/fix_typo_guides_active_support_instrumentation 
Fix typo guides/source/active_support_instrumentation.md [ci-skip]
 2014-05-21 15:12:54 -05:00
Marat Khusnetdinov
decd92b6fb Fix typo guides/source/active_support_instrumentation.md 2014-05-22 00:00:55 +04:00
Rafael Mendonça França
465736bf85 Merge pull request #15229 from peeyushsingla/master 
fixes in active record query for reorder in rails guides
 2014-05-21 15:30:38 -03:00
peeyush
18c5f4ef9d fixes in active record query for reorder 2014-05-21 23:40:19 +05:30
Rafael Mendonça França
5335f4c080 Merge pull request #15227 from sgrif/sg-rename-oid-type 
Rename `oid_type` to `cast_type` to make PG columns consistent with abstract columns
 2014-05-21 14:56:23 -03:00
Sean Griffin
b871b3fab5 Rename oid_type to cast_type to make PG columns consistent 2014-05-21 10:11:30 -07:00
Rafael Mendonça França
b042f21c93 Merge pull request #15219 from sgrif/sg-missing-nodoc 
Add missing nodoc
 2014-05-21 12:42:47 -03:00
Rafael Mendonça França
94e7dbce8a Merge pull request #14613 from Sirupsen/fix-serialize-update-column 
Fix serialized field returning serialized data after update_column

Conflicts:
	activerecord/CHANGELOG.md
 2014-05-21 12:38:11 -03:00
Rafael Mendonça França
6931bed1b4 Revert "Merge pull request #14544 from jefflai2/named_scope_sti" 
This reverts commit 9a1abedcdeecd9464668695d4f9c1d55a2fd9332, reversing
changes made to c72d6c91a7c0c2dc81cc857a1d6db496e84e0065.

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/test/models/comment.rb

This change break integration with activerecord-deprecated_finders so
I'm reverting until we find a way to make it work with this gem.
 2014-05-21 12:15:57 -03:00
Sean Griffin
89357455eb Add missing nodocs to MySQL adapter 2014-05-21 08:08:51 -07:00
Arthur Nogueira Neves
1a6b25574f Merge pull request #15221 from laurelfan/doc-fix-redirecting 
fix formatting and text for ActionController::Redirecting doc
 2014-05-21 10:58:48 -04:00
Laurel Fan
4e986e398f fix formatting and text for ActionController::Redirecting doc 2014-05-21 07:51:09 -07:00
Yves Senn
b452e4a39b build fix, use lambda syntax that ruby 1.9.3 understands. 2014-05-21 10:22:10 +02:00
Yves Senn
1a92f4fb65 push extract_scale to the Type. 
- `extract_precision`, `extract_limit`, and `extract_default` probably need to follow.
  - would be good to remove the delegation `Column#extract_scale`.

/cc @sgrif
 2014-05-21 09:51:36 +02:00
Yves Senn
6b4f6d0064 pg, extract money tests into separate file. 
- Added assertions about the column. Specifically scale.
- Move record insertion from setup into test method.
 2014-05-21 09:46:37 +02:00
Yves Senn
f69f20e4ff Merge pull request #14855 from laurocaetano/fix_polymorphic_with_string_key 
Fix polymorphic eager load with foreign_key as String.
 2014-05-21 08:51:32 +02:00
Lauro Caetano
4debc86bd3 Fix polymorphic eager load with foreign_key as String. 
The foreign_key could be `String` and just doing `owners_map[owner_key]`
could return `nil`.
To prevent this bug, we should `to_s` both keys if their types are
different.

Fixes #14734.
 2014-05-20 23:26:51 -03:00
Rafael Mendonça França
b17f6e6877 Merge pull request #15213 from tgxworld/remove_redundant_code 
Remove redundant code.
 2014-05-20 23:25:13 -03:00
Guo Xiang Tan
dbacaff1c3 Remove redundant code. 2014-05-20 18:25:20 -07:00
Rafael Mendonça França
decd719711 Merge pull request #10887 from sakuro/deep_transform_keys_in_nested_arrays 
Hash#deep_*_keys(!) recurse into nested arrays.

Conflicts:
	activesupport/CHANGELOG.md
 2014-05-20 21:49:58 -03:00
Rafael Mendonça França
9a1abedcde Merge pull request #14544 from jefflai2/named_scope_sti 
Fixes Issue #13466.

Conflicts:
	activerecord/CHANGELOG.md
 2014-05-20 21:35:58 -03:00
Rafael Mendonça França
c72d6c91a7 Merge pull request #15205 from sgrif/sg-delegate-klass 
Delegate `klass` to the injected type object
 2014-05-20 21:17:38 -03:00
Rafael Mendonça França
437f464b39 Merge pull request #14979 from brocktimus/master 
Making belongs_to: touch behaviour be consistent with save updating updated_at
 2014-05-20 21:03:56 -03:00
Rafael Mendonça França
26931eb320 Revert "Revert "Merge pull request #8313 from alan/only_save_changed_has_one_objects"" 
This reverts commit e94e6c27af495a2460c811bb506459f1428dec6b.

Conflicts:
	activerecord/CHANGELOG.md

The original commit was reverted only to be safe since #14407 were reported.
We don't have any proof we added a regression with the original commit
so reverting it now will give us more problem.

Closes #14407
 2014-05-20 20:42:46 -03:00
Sean Griffin
c4245c31c6 Delegate klass to the injected type object 2014-05-20 16:37:35 -07:00
Brock Trappitt
713fc39d93 Prevented belongs_to: touch propagating up if there are no changes being saved 2014-05-21 07:34:53 +08:00
Rafael Mendonça França
5508a3e5ca Merge pull request #15154 from msgehard/move_password_field 
Put attr_reader in with all of the other instance methods
 2014-05-20 20:24:51 -03:00
Aaron Patterson
089d9baa33 we don't use this parameter for anything, so rm 2014-05-20 16:06:59 -07:00
Aaron Patterson
ba487b9bb0 fewer string allocations per url_for 2014-05-20 15:43:46 -07:00
Aaron Patterson
b610104e5c mutate the path string to avoid object allocations 2014-05-20 15:33:30 -07:00
Aaron Patterson
5f49da8c6d push only_path conditional up 2014-05-20 15:29:40 -07:00
Aaron Patterson
960398cb26 push arg checking up 2014-05-20 15:23:38 -07:00
Aaron Patterson
6004c753fe fewer method calls and string garbage when there is no user/password 2014-05-20 15:20:16 -07:00
Aaron Patterson
5e181ed0ae fewer hash allocations when calling url_for 2014-05-20 15:09:04 -07:00
Aaron Patterson
84bf3a0815 fix variable names, only pass hashes to the positional args method 2014-05-20 15:09:03 -07:00
Rafael Mendonça França
470c4dfe2d Merge pull request #15208 from sgrif/sg-delegate-type-cast-for-write 
Delegate `type_cast_for_write` to injected type object
 2014-05-20 18:42:14 -03:00
Sean Griffin
32218c10fa Delegate type_cast_for_write to injected type object 2014-05-20 14:36:18 -07:00
Rafael Mendonça França
ef00bb7196 Merge pull request #11346 from tomykaira/fix_10257 
Check authentication scheme in Basic auth
 2014-05-20 18:12:13 -03:00
Rafael Mendonça França
52b558695d Merge pull request #15207 from sgrif/sg-inline-column-helpers 
Inline typecasting helpers from Column to the appropriate types
 2014-05-20 18:10:54 -03:00
Sean Griffin
8f38799505 Inline typecasting helpers from Column to the appropriate types 2014-05-20 14:07:58 -07:00
Rafael Mendonça França
90a82cbfb2 Merge pull request #15206 from sgrif/sg-type-map-postgresql 
Use the generic type map for PostgreSQL OID registrations
 2014-05-20 18:05:35 -03:00
Rafael Mendonça França
c4640ca805 Merge pull request #15204 from sgrif/sg-delegate-predicates 
Delegate predicate methods to injected type object on Column
 2014-05-20 18:02:49 -03:00
Sean Griffin
9f61f31c2c Use the generic type map for PostgreSQL OID registrations 2014-05-20 13:55:03 -07:00
Sean Griffin
50869f37d3 Delegate predicate methods to injected type object on Column 2014-05-20 13:34:35 -07:00
Aaron Patterson
25c6726372 remove dead code 2014-05-20 13:25:14 -07:00
Aaron Patterson
c99ff6df00 cache the formatter on the path object 2014-05-20 13:25:14 -07:00
Aaron Patterson
e883db02bc translate AST to a formatter before url generation 2014-05-20 13:25:13 -07:00