aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Differentiate between remove_column and remove_columns. Make remove_column ↵Marc-Andre Lafortune2012-12-216-19/+44
| | | | | | reversible. [#8267]
* Make drop_table reversible [#8267]Marc-Andre Lafortune2012-12-214-17/+41
|
* Add drop_join_table [#8267]Marc-Andre Lafortune2012-12-214-7/+69
|
* Add Migration#reversible for reversible data operations [#8267]Marc-Andre Lafortune2012-12-213-1/+85
|
* Allow revert of whole migration [#8267]Marc-Andre Lafortune2012-12-212-3/+102
|
* Extract exec_migration [#8267]Marc-Andre Lafortune2012-12-211-11/+16
|
* Allow reverting of migration commands with Migration#revert [#8267]Marc-Andre Lafortune2012-12-214-90/+155
|
* Split ridiculously long lineMarc-Andre Lafortune2012-12-211-1/+4
|
* Simple replacement of variable name for consistencyMarc-Andre Lafortune2012-12-211-32/+32
|
* Simplify change_table and avoid duplicated logicMarc-Andre Lafortune2012-12-212-40/+7
|
* Revert "Make sure that ActiveSupport::Logger includes the Logger extensions ↵David Heinemeier Hansson2012-12-214-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 Hansson2012-12-214-30/+21
| | | | core_ext/logger
* Add ActiveSupport::Logger#silence that works the same as the old ↵David Heinemeier Hansson2012-12-215-20/+45
| | | | Logger#silence extension
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-12-214-23/+45
|\
| * copy edits in assets guide [ci skip]Vijay Dev2012-12-211-23/+26
| |
| * Revert "Fix incorrect adjustment 4c41e87e3ae548c44810b66437b2f0f6e73b2106"Vijay Dev2012-12-211-1/+1
| | | | | | | | | | | | | | | | This reverts commit e1f8ec59f2cc83f052b15233147aa2d6d8114a4d. Reason: seems bad styling [ci skip]
| * Fix incorrect adjustment 4c41e87e3ae548c44810b66437b2f0f6e73b2106kei2012-12-201-1/+1
| |
| * Fix documentation stylekei2012-12-201-1/+1
| |
| * Remove Reference to Ruby 1.8.7John Kelly2012-12-201-2/+1
| |
| * Explain controller specific assets more thoroughlyDamian Galarza2012-12-171-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 optionsIvan Vanyak2012-12-171-0/+5
| |
* | Serialized attribute can be serialized in an integer columnRafael Mendonça França2012-12-215-3/+47
| | | | | | | | Fix #8575
* | Wrap table creation in a transaction.Rafael Mendonça França2012-12-211-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 Silva2012-12-211-1/+1
| |
* | Fix indentation issuing warningCarlos Antonio da Silva2012-12-201-1/+1
| |
* | Merge pull request #8560 from u16suzu/masterRafael Mendonça França2012-12-201-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Fix document for String#humanize Conflicts: activesupport/lib/active_support/core_ext/string/inflections.rb
| * | Fix: documentation for String#humanizeYuichiro Suzuki2012-12-201-2/+2
| | |
* | | Merge pull request #8567 from frodsan/update_coding_conventions_journeyRafael Mendonça França2012-12-2017-438/+440
|\ \ \ | | | | | | | | update AD::Journey to follow Rails coding conventions
| * | | update AD::Journey to follow Rails coding conventionsFrancesco Rodriguez2012-12-2017-438/+440
| | | |
* | | | Fix CHANGELOG entry about scope changeGuillermo Iguaran2012-12-201-1/+1
|/ / / | | | | | | I missed attribution on this :flushed:
* | | 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
| | | |