| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Revert "Make sure that ActiveSupport::Logger includes the Logger extensions ↵ | David Heinemeier Hansson | 2012-12-21 | 4 | -21/+30 |
| | | | | | | | from core_ext/logger" (some confusion over deprecation) This reverts commit d00f568a83a5159ed93618b1081bd17858536d1c. | ||||
| * | Make sure that ActiveSupport::Logger includes the Logger extensions from ↵ | David Heinemeier Hansson | 2012-12-21 | 4 | -30/+21 |
| | | | | | core_ext/logger | ||||
| * | Add ActiveSupport::Logger#silence that works the same as the old ↵ | David Heinemeier Hansson | 2012-12-21 | 5 | -20/+45 |
| | | | | | Logger#silence extension | ||||
| * | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-12-21 | 4 | -23/+45 |
| |\ | |||||
| | * | copy edits in assets guide [ci skip] | Vijay Dev | 2012-12-21 | 1 | -23/+26 |
| | | | |||||
| | * | Revert "Fix incorrect adjustment 4c41e87e3ae548c44810b66437b2f0f6e73b2106" | Vijay Dev | 2012-12-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | This reverts commit e1f8ec59f2cc83f052b15233147aa2d6d8114a4d. Reason: seems bad styling [ci skip] | ||||
| | * | Fix incorrect adjustment 4c41e87e3ae548c44810b66437b2f0f6e73b2106 | kei | 2012-12-20 | 1 | -1/+1 |
| | | | |||||
| | * | Fix documentation style | kei | 2012-12-20 | 1 | -1/+1 |
| | | | |||||
| | * | Remove Reference to Ruby 1.8.7 | John Kelly | 2012-12-20 | 1 | -2/+1 |
| | | | |||||
| | * | Explain controller specific assets more thoroughly | Damian Galarza | 2012-12-17 | 1 | -17/+32 |
| | | | | | | | | | | | | | | | | | | | The current section on controller specific assets does not really explain how the default application.css and application.js files generated by rails will work with controller specific assets and is a bit ambiguous. We should remind users that they will be included into their application by default but that they have the option to include them only where needed if they want and how this works with precompiling assets. [ci_skip] | ||||
| | * | Add script_name option description and example for #url_for options | Ivan Vanyak | 2012-12-17 | 1 | -0/+5 |
| | | | |||||
| * | | Serialized attribute can be serialized in an integer column | Rafael Mendonça França | 2012-12-21 | 5 | -3/+47 |
| | | | | | | | | | Fix #8575 | ||||
| * | | Wrap table creation in a transaction. | Rafael Mendonça França | 2012-12-21 | 1 | -6/+8 |
| | | | | | | | | | This will make the tests pass when the intrange datatype is not present | ||||
| * | | Fix doc pointing to non existent logger class [ci skip] | Carlos Antonio da Silva | 2012-12-21 | 1 | -1/+1 |
| | | | |||||
| * | | Fix indentation issuing warning | Carlos Antonio da Silva | 2012-12-20 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #8560 from u16suzu/master | Rafael Mendonça França | 2012-12-20 | 1 | -2/+2 |
| |\ \ | | | | | | | | | | | | | | | | | | | Fix document for String#humanize Conflicts: activesupport/lib/active_support/core_ext/string/inflections.rb | ||||
| | * | | Fix: documentation for String#humanize | Yuichiro Suzuki | 2012-12-20 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge pull request #8567 from frodsan/update_coding_conventions_journey | Rafael Mendonça França | 2012-12-20 | 17 | -438/+440 |
| |\ \ \ | | | | | | | | | update AD::Journey to follow Rails coding conventions | ||||
| | * | | | update AD::Journey to follow Rails coding conventions | Francesco Rodriguez | 2012-12-20 | 17 | -438/+440 |
| | | | | | |||||
| * | | | | Fix CHANGELOG entry about scope change | Guillermo Iguaran | 2012-12-20 | 1 | -1/+1 |
| |/ / / | | | | | | | I missed attribution on this :flushed: | ||||
| * | | | Fix Action Mailer changelog indenation to match other changelogs | Carlos Antonio da Silva | 2012-12-19 | 4 | -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 Silva | 2012-12-19 | 1 | -4/+8 |
| | | | | |||||
| * | | | Merge pull request #8565 from frodsan/wed_code_journey | Carlos Antonio da Silva | 2012-12-19 | 20 | -85/+77 |
| |\ \ \ | | | | | | | | | nodoc Journey and remove unneeded Ruby <1.9 validation | ||||
| | * | | | :nodoc: Journey because is not part of the public API [ci skip] | Francesco Rodriguez | 2012-12-19 | 20 | -78/+75 |
| | | | | | |||||
| | * | | | remove code for Ruby 1.8.x support | Francesco Rodriguez | 2012-12-19 | 1 | -7/+2 |
| |/ / / | |||||
| * | | | Remove the actual extension file as well [ci skip] | Andrew White | 2012-12-19 | 1 | -11/+0 |
| | | | | |||||
| * | | | Remove obsolete Hash extension needed for Ruby 1.8.x support | Andrew White | 2012-12-19 | 1 | -1/+0 |
| | | | | | | | | | | | | | [ci skip] | ||||
| * | | | Integrate Journey into Action Dispatch | Andrew White | 2012-12-19 | 46 | -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_safe | José Valim | 2012-12-19 | 1 | -1/+10 |
| |\ \ \ | | | | | | | | | Attempt to fix slow runner name method | ||||
| | * | | | attempt to fix slow runner name method | Max Shytikov | 2012-12-19 | 1 | -1/+10 |
| | | | | | |||||
| * | | | | Move changelog entry to the top [ci skip] | Carlos Antonio da Silva | 2012-12-19 | 1 | -5/+5 |
| |/ / / | |||||
| * | | | Revert "Add test to deprecation of Path#children" | Carlos Antonio da Silva | 2012-12-19 | 1 | -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_copy | Carlos Antonio da Silva | 2012-12-19 | 3 | -2/+16 |
| |\ \ \ | | | | | | | | | Leep index names when using `alter_table` with sqlite3. Closes #3489 | ||||
| | * | | | Keep index names when using with sqlite3 | Yves Senn | 2012-12-19 | 3 | -2/+16 |
| | | | | | |||||
| * | | | | Merge pull request #8554 from yahonda/binary_count_oracle | Carlos Antonio da Silva | 2012-12-19 | 1 | -2/+1 |
| |\ \ \ \ | | | | | | | | | | | Address test_binary_data_is_not_logged with Oracle database | ||||
| | * | | | | Address test_binary_data_is_not_logged with Oracle database | Yasuo Honda | 2012-12-19 | 1 | -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-encoding | David Heinemeier Hansson | 2012-12-18 | 3 | -110/+17 |
| |\ \ \ \ | | | | | | | | | | | Remove obfuscation support from mail_to helper | ||||
| | * | | | | Remove obfuscation support from mail_to helper | Nick Reed | 2012-12-18 | 3 | -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_tests | Carlos Antonio da Silva | 2012-12-18 | 2 | -2/+5 |
| |\ \ \ \ | |/ / / |/| | | | Fix railties tests related to the addition of app/[models|controllers]/concerns, and improve changelog. | ||||
| | * | | | update concerned tests | Francesco Rodriguez | 2012-12-18 | 1 | -0/+2 |
| | | | | | |||||
| | * | | | fix railties CHANGELOG [ci skip] | Francesco Rodriguez | 2012-12-18 | 1 | -2/+3 |
| |/ / / | |||||
| * | | | Fix argument name in fixtures method | Carlos Antonio da Silva | 2012-12-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | Relatedo to 8e44c93b4c0e4b1bdd0fca13b79f5be1088d6959. | ||||
| * | | | Revert "use File.basename to get the filename minus .yml" | Aaron Patterson | 2012-12-18 | 1 | -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ça | 2012-12-18 | 3 | -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ça | 2012-12-18 | 2 | -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. Weaver | 2012-12-18 | 2 | -4/+17 |
| |/ / / | | | | | | | | | | disable_referential_integrity. | ||||
| * | | | Fix changelog | David Heinemeier Hansson | 2012-12-18 | 1 | -3/+1 |
| | | | | |||||
| * | | | Merge | David Heinemeier Hansson | 2012-12-18 | 22 | -49/+374 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'uniqueness-validation-postgresql-arrays' | Carlos Antonio da Silva | 2012-12-18 | 3 | -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 methods | Carlos Antonio da Silva | 2012-12-18 | 1 | -16/+22 |
| | | | | | | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |