aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Eager loading made to use relation's in_clause_length instead of host's one ↵Boris Staal2012-12-203-8/+13
| | | | (fixes #8474)
* Fix Action Mailer changelog indenation to match other changelogsCarlos Antonio da Silva2012-12-194-27/+29
| | | | Also some minor improvements to other changelogs. [ci skip]
* Improve AMo changelog example to not rely on AR [ci skip]Carlos Antonio da Silva2012-12-191-4/+8
|
* Merge pull request #8565 from frodsan/wed_code_journeyCarlos Antonio da Silva2012-12-1920-85/+77
|\ | | | | nodoc Journey and remove unneeded Ruby <1.9 validation
| * :nodoc: Journey because is not part of the public API [ci skip]Francesco Rodriguez2012-12-1920-78/+75
| |
| * remove code for Ruby 1.8.x supportFrancesco Rodriguez2012-12-191-7/+2
|/
* Remove the actual extension file as well [ci skip]Andrew White2012-12-191-11/+0
|
* Remove obsolete Hash extension needed for Ruby 1.8.x supportAndrew White2012-12-191-1/+0
| | | | [ci skip]
* Integrate Journey into Action DispatchAndrew White2012-12-1946-6/+3970
| | | | | | | | Move the Journey code underneath the ActionDispatch namespace so that we don't pollute the global namespace with names that may be used for models. Fixes rails/journey#49.
* Merge pull request #8559 from mshytikov/runner_method_is_slow_with_thread_safeJosé Valim2012-12-191-1/+10
|\ | | | | Attempt to fix slow runner name method
| * attempt to fix slow runner name methodMax Shytikov2012-12-191-1/+10
| |
* | Move changelog entry to the top [ci skip]Carlos Antonio da Silva2012-12-191-5/+5
|/
* Revert "Add test to deprecation of Path#children"Carlos Antonio da Silva2012-12-191-6/+0
| | | | | | | | | | This reverts commit 29b1dc273e1ad6b9e13bf48fe3f12047850f9554. Conflicts: railties/test/application/paths_test.rb Reason: since 7f96e4317e1354852e9600becb16662de3c17691 was reverted, Path#children is no longer deprecated.
* Merge pull request #8522 from senny/3489_index_names_on_copyCarlos Antonio da Silva2012-12-193-2/+16
|\ | | | | Leep index names when using `alter_table` with sqlite3. Closes #3489
| * Keep index names when using with sqlite3Yves Senn2012-12-193-2/+16
| |
* | Merge pull request #8554 from yahonda/binary_count_oracleCarlos Antonio da Silva2012-12-191-2/+1
|\ \ | | | | | | Address test_binary_data_is_not_logged with Oracle database
| * | Address test_binary_data_is_not_logged with Oracle databaseYasuo Honda2012-12-191-2/+1
| |/ | | | | | | | | | | The number of sql statement logged depends on each database adapter implementation. Also, this test does not depends on how many sql statement executed.
* | Merge pull request #8523 from reednj77/remove-mail-to-encodingDavid Heinemeier Hansson2012-12-183-110/+17
|\ \ | | | | | | Remove obfuscation support from mail_to helper
| * | Remove obfuscation support from mail_to helperNick Reed2012-12-183-110/+17
|/ / | | | | | | | | | | Removes support for :encode, :replace_at, and :replace_dot options from the mail_to helper. Support for these options has been extracted to the 'actionview-encoded_mail_to' gem.
* | Merge pull request #8552 from frodsan/concerned_testsCarlos Antonio da Silva2012-12-182-2/+5
|\ \ | |/ |/| Fix railties tests related to the addition of app/[models|controllers]/concerns, and improve changelog.
| * update concerned testsFrancesco Rodriguez2012-12-181-0/+2
| |
| * fix railties CHANGELOG [ci skip]Francesco Rodriguez2012-12-181-2/+3
|/
* Fix argument name in fixtures methodCarlos Antonio da Silva2012-12-181-1/+1
| | | | Relatedo to 8e44c93b4c0e4b1bdd0fca13b79f5be1088d6959.
* Revert "use File.basename to get the filename minus .yml"Aaron Patterson2012-12-181-4/+3
| | | | | | | This reverts commit 00c5342d96a3677c0a6a2bb8316c76182f5bdfdd. Conflicts: activerecord/lib/active_record/fixtures.rb
* Revert "Merge pull request #7587 from elia/fix-too-eager-loading"Rafael Mendonça França2012-12-183-17/+6
| | | | | | | | | | This reverts commit 3663057518eb9acf9b1e72f47dcb07038e6b7368. REASON: This caused a regression that add app folder in the eager load path. See #8146 for more information. Conflicts: railties/CHANGELOG.md
* Merge pull request #8548 from ↵Rafael Mendonça França2012-12-182-4/+17
|\ | | | | | | | | garysweaver/postgresql_fallback_to_disable_user_triggers fix #5523: postgresql adapter to disable user triggers in disable_referential_integrity
| * #5523 Add ability for postgresql adapter to disable user triggers in ↵Gary S. Weaver2012-12-182-4/+17
|/ | | | disable_referential_integrity.
* Fix changelogDavid Heinemeier Hansson2012-12-181-3/+1
|
* MergeDavid Heinemeier Hansson2012-12-1822-49/+374
|\
| * Merge branch 'uniqueness-validation-postgresql-arrays'Carlos Antonio da Silva2012-12-183-35/+58
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When setting an array column (or other PostgreSQL-specific data type) to be validated for uniqueness, the resulting SQL query is generated with syntax errors, like this: SELECT 1 AS one FROM "postgresql_arrays" WHERE "postgresql_arrays"."nicknames" = '["john", "johnny"]' LIMIT 1 This happens because Ruby Arrays must be type-casted to their PostgreSQL equivalent. This small patch fixes this issue, calling the adapter's type_cast method. Closes #8077
| | * Extract some methodsCarlos Antonio da Silva2012-12-181-16/+22
| | |
| | * Change relation in placeCarlos Antonio da Silva2012-12-181-1/+1
| | |
| | * Simplify value logic by always typecastingCarlos Antonio da Silva2012-12-181-11/+5
| | |
| | * Avoid unnecessary hashes with error optionsCarlos Antonio da Silva2012-12-181-1/+4
| | |
| | * Remove prepend_and_append requirement from ASCarlos Antonio da Silva2012-12-181-3/+1
| | | | | | | | | | | | It's not necessary to use this extension here, we are fine with Array#unshift.
| | * Refactor uniqueness validator logic a bitCarlos Antonio da Silva2012-12-181-10/+5
| | | | | | | | | | | | | | | Cleanup some code, avoid extra hash with reverse_merge, and don't use send for :id, since it's always present.
| | * Added support for validates_uniqueness_of in PostgreSQL array columns. ↵Pedro Padron2012-12-183-4/+31
| |/ | | | | | | Fixes: #8075.
| * Minor js review [ci skip]Carlos Antonio da Silva2012-12-181-7/+7
| | | | | | | | Remove/add ; where necessary, fix indentation.
| * Merge pull request #8389 from nashby/issue-8388Steve Klabnik2012-12-183-3/+33
| |\ | | | | | | handle protocol option in stylesheet_link_tag and javascript_include_tag
| | * handle protocol option in stylesheet_link_tag and javascript_include_tagVasiliy Ermolovich2012-12-183-3/+33
| |/ | | | | | | closes #8388
| * Merge pull request #8543 from schneems/schneems/html-route-errorRafael Mendonça França2012-12-176-76/+81
| |\ | | | | | | Format routes as html on debug page
| | * Format routes as html on debug pageschneems2012-12-176-76/+81
| |/ | | | | | | | | | | | | | | | | When someone gets a routing exception, the routes are rendered (starting in Rails 4.0). This PR brings parity between the html routes in the `rails/info/routes` path and when rendered from an exception. This is the continuation of #8521 which brought html formatted routes. In addition to bringing parity to the two views, we're keeping our views DRY by rendering off of the same partials. In this case Railties depends on partials provided by ActionDispatch. I'm open to alternative implementations. Ideally both views will use the same code so any improvements or updates to it will be reproduced on both. <hr /> ![](http://f.cl.ly/items/3O1D0K1v0j0i343O3T3T/Screen%20Shot%202012-12-17%20at%203.07.20%20PM.png)
| * Merge pull request #8542 from le0pard/fixed_ar_intrangeRafael Mendonça França2012-12-172-5/+29
| |\ | | | | | | AR supporting new int4range and int8range data type on PostgreSQL >= 9.2. Fix #8528 pull request
| | * AR supporting new int4range and int8range data type on PostgreSQL >= 9.2. ↵Alexey2012-12-172-5/+29
| | | | | | | | | | | | Fix realization
| * | Merge pull request #8528 from le0pard/fixed_ar_intrangeRafael Mendonça França2012-12-179-5/+170
| |\| | | | | | | AR supporting new int4range and int8range data type on PostgreSQL >= 9.2
| | * AR supporting new intrange data type on PostgreSQL >= 9.2Alexey2012-12-169-5/+170
| | |
| * | Merge pull request #8521 from schneems/schneems/html-routesRafael Mendonça França2012-12-174-4/+80
| |\ \ | | | | | | | | HTML formatting to Rails::InfoController#routes
| | * | HTML formatting to Rails::InfoController#routesschneems2012-12-174-4/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR adds formatting and meta-data to the display of the internal routes. Users can now toggle between showing helpers with the `_path` or _`url` suffix. There are multiple ways to achieve this, this method uses partials for formatting and meta-data. The partials can be re-used when rendering `routing_error.erb`, though that will need to be in a separate PR. ![](http://f.cl.ly/items/3A2p3c1T1t2f2X2R2K2S/Screen%20Shot%202012-12-12%20at%202.28.01%20PM.png) ATP Railties
* | | | Add app/models/concerns and app/controllers/concerns to the default ↵David Heinemeier Hansson2012-12-183-0/+17
|/ / / | | | | | | | | | directory structure and load path
* | | Make conditional_layout? private and update documentationAndrew White2012-12-171-15/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The conditional_layout? method is not for public use and doesn't actually do what the documentation suggested it does. It's actually used to determine whether or not to use the explicit layout definition defined in a controller or use the implicit layout definition. Also documentation was added for the action_has_layout? method which acts as a master switch for disabling the layout for the current action. This method was added so that action caching didn't depend on accessing layout internals but is also used by third-parties, most notably the [Hobo][1] application. [1]: https://github.com/hobo/hobo
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 23:43:07 +0000