Rafael Mendonça França
d447eef20b
Merge pull request #14711 from swoker/activerecord_fix_aggregate_methods_with_select
...
Activerecord fix aggregate methods with select
2014-04-11 15:13:36 -03:00
Simon Woker
70fffaccfc
fix exception on polymorphic associations with predicates
2014-04-11 17:54:03 +00:00
Rafael Mendonça França
7bb8fd2f64
Merge pull request #14646 from deivid-rodriguez/provide_byebug_by_default
...
Improve debugging support
2014-04-11 13:55:10 -03:00
Rafael Mendonça França
4e9c0b7874
Fix version indicator on guides and link to Rails 4.0 [ci skip]
2014-04-11 13:39:37 -03:00
Rafael Mendonça França
f166f1da46
Merge pull request #14689 from matthewd/asset_initializer
...
Move assets precompile (and version) to an initializer
2014-04-11 12:56:03 -03:00
Rafael Mendonça França
f1a4f0a494
Add CHANGELOG entry for #14619 [ci skip]
2014-04-11 11:27:41 -03:00
Rafael Mendonça França
3abed7faca
Merge pull request #14619 from winston/enhance-routing-error-html
...
Enhance routing error html page
2014-04-11 11:25:20 -03:00
Rafael Mendonça França
08775e347f
Merge pull request #14707 from minio-sk/fix-issue-14702
...
Be explicit about allowed constraint values, fixes #14702
2014-04-11 11:10:59 -03:00
Yves Senn
d91117f225
Merge pull request #14692 from senny/pg/reload_type_map_for_unknown_types
...
PostgreSQL automatic type map reload
2014-04-11 16:04:50 +02:00
Jano Suchal
aca64fed43
Be explicit about allowed constraint values, fixes #14702
2014-04-11 15:19:37 +02:00
Matthew Draper
f612c2b052
Move assets precompile (and version) to an initializer
...
sprockets-rails 2.1 needs the precompile list to be available in all
environments.
2014-04-11 22:47:54 +09:30
Rafael Mendonça França
d0b5484b5d
Merge pull request #14705 from akshay-vishnoi/doc_changes
...
Add more test case for #demodulize, Improve documentation
2014-04-11 09:46:22 -03:00
Akshay Vishnoi
075a1e21fa
Add more test case for #demodulize, Improve documentation
2014-04-11 17:57:16 +05:30
David Rodríguez de Dios
545afc150e
Re-review the debugging guide.
...
Tested on a brand new app to exactly match current byebug's behaviour.
2014-04-11 13:55:42 +02:00
Andrew White
142448259d
Merge pull request #14684 from Futurelearn/jc-deep-nested-shallow-url-helper-bug
...
Add a failing test for a URL helper that was broken by a6b9ea2.
2014-04-11 10:26:23 +01:00
Andrew White
e10f26f9e9
Only make deeply nested routes shallow when parent is shallow
...
Since `:shallow` may be set at any point in the resource nesting we should
only make the new and collection routes shallow when the parent is shallow.
This is a bit of a hack but until the mapper is refactored to an object graph
instead of a hash of merged values it's the best we can do.
Fixes #14684 .
2014-04-11 10:20:54 +01:00
Winston
14391d7e2e
Split search results into 'exact matches' and 'fuzzy matches'.
...
- also refactored the javascript.
2014-04-11 17:09:00 +08:00
Winston
2ad5dad203
Improve CSS styling for routing error html page.
2014-04-11 17:09:00 +08:00
Winston
976495c787
Implement fuzzy matching for route search on routing error html page.
2014-04-11 17:09:00 +08:00
Yves Senn
9f62344d95
PostgreSQL, warn once per connection per missing OID. Closes #14275 .
...
[Yves Senn & Matthew Draper]
2014-04-11 11:07:38 +02:00
Yves Senn
0c9bbc6326
PostgreSQL, adapter automatically reloads it's type map. Closes #14678 .
...
[Yves Senn & Matthew Draper]
2014-04-11 11:07:17 +02:00
David Rodríguez de Dios
8834847a37
Minor fixes in the rails debugging guide
2014-04-11 11:00:19 +02:00
Yves Senn
856ffbe705
docs, make association autosave: true
examples runnable. Closes #14700
...
[ci skip]
The examples are written in a way you expect them to be executable.
However one snippet assumed there to be two comments when only one
was created above.
The defined models did not extend `ActiveRecord::Base`
The example used `comments.last.mark_for_destruction`. This does no
longer load the whole collection but just the last record. It is
then refetcht on subsequent calls to `last`. This breaks the example.
2014-04-11 07:53:39 +02:00
Rafael Mendonça França
a7a180bd81
Merge pull request #12829 from iantropov/issue_insert_via_hmt_scope_3548
...
Fix insertion of records for hmt association with scope
Conflicts:
activerecord/CHANGELOG.md
2014-04-10 17:44:32 -03:00
Rafael Mendonça França
632d9d2237
Merge pull request #14694 from heironimus/callback_guide
...
Add after_commit/after_rollback to callback list
2014-04-10 17:13:17 -03:00
Rafael Mendonça França
167e6dacaf
Merge pull request #14695 from akshay-vishnoi/doc_changes
...
[ci skip] Remove false documentation
2014-04-10 17:03:10 -03:00
Akshay Vishnoi
8c1406cf25
[ci skip] Remove false documentation
2014-04-11 01:28:47 +05:30
Kyle Heironimus
16f481b28b
Add after_commit/after_rollback to callback list
...
Adding after_commit/after_rollback to list of callbacks in order helps
explain the callback order as well as making it consistent with the API
docs at http://api.rubyonrails.org/classes/ActiveRecord/Callbacks.html
2014-04-10 14:58:36 -05:00
Rafael Mendonça França
1938c9646b
Remove warning of unused variable
2014-04-10 15:58:08 -03:00
Rafael Mendonça França
ea2c31e281
Merge branch 'rm-uuid-fixtures'
2014-04-10 15:57:36 -03:00
Rafael Mendonça França
7edb204598
No need to call send
2014-04-10 15:43:51 -03:00
Rafael Mendonça França
085ce4f141
Merge branch 'master' into rm-uuid-fixtures
...
Conflicts:
activerecord/CHANGELOG.md
activesupport/CHANGELOG.md
2014-04-10 15:34:55 -03:00
Rafael Mendonça França
53610e5140
Require action_controller before any other action_controller file
...
This will load properly the loading hooks.
Closes rails/sass-rails#205
2014-04-10 15:00:03 -03:00
Rafael Mendonça França
6e9af5c7e5
Merge pull request #11656 from emre-basala/xml_mini_test
...
Add tests to ActiveSupport:XmlMini to_tag method
2014-04-10 14:38:22 -03:00
Rafael Mendonça França
85b48d2bcb
Merge pull request #14677 from JuanitoFatas/update-initialization-code-snippets
...
[ci skip] Update code snippets to latest master (initialization.md).
2014-04-10 14:10:10 -03:00
Simon Woker
afd4d8205e
Fix error for aggregate methods with select, see issue #13648
2014-04-10 16:58:39 +00:00
Juanito Fatas
3664e3a430
[ci skip] Update code snippets to latest master (initialization.md).
...
Also update the `server.run` example (Replace Mongrel with Puma).
2014-04-10 22:44:47 +08:00
David Rodríguez de Dios
7fe49a4545
Prevent generation of extra whitespace in templates
2014-04-10 16:20:46 +02:00
David Rodríguez de Dios
6fae9ac581
Isolate debugger related code
2014-04-10 16:02:13 +02:00
James Coglan
77252c332e
Add a failing test for a URL helper that was broken by a6b9ea2.
2014-04-10 13:54:41 +01:00
Yves Senn
d8d0fcb06a
Merge pull request #14679 from pbharadiya/master
...
Correct factual error for page not found [ci skip]
2014-04-10 12:41:07 +02:00
Parth Bharadiya
3fe7b5f4a1
Correct factual error for page not found
2014-04-10 15:41:09 +05:30
Akira Matsuda
bb63e9c590
+EOL
2014-04-10 15:44:38 +09:00
Aaron Patterson
febfc57e56
Merge pull request #11411 from dscataglini/master
...
Active support callback's before/after/around filters are not correctly making their singleton methods private
2014-04-09 20:04:23 -07:00
Carlos Antonio da Silva
9a8af0c150
Only call uniq on the conditional that actually needs it
2014-04-09 23:31:14 -03:00
Carlos Antonio da Silva
cf0e44c771
Remove extra collect call
2014-04-09 23:30:47 -03:00
Aaron Patterson
82cb4777c1
Merge pull request #14675 from laurocaetano/make_reflection_caches_works_with_string_keys
...
Make reflection and aggregate_reflection caches work with string keys.
2014-04-09 19:19:59 -07:00
Lauro Caetano
213ef567ae
Make sure the reflection test is passing a String to the reflection
...
cache.
2014-04-09 21:56:40 -03:00
Lauro Caetano
e7630b62a6
Make the aggregate_reflections cache work with strings as its keys.
2014-04-09 21:34:48 -03:00
Lauro Caetano
4c6ba7432d
No need to call to_sym
on reflection name, since the cache now works
...
with strings with string keys.
Related #14668 .
2014-04-09 21:25:39 -03:00