aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Updated security guide with information about secret_token.rb and to suggest ...Gary S. Weaver2012-12-211-7/+11
* Revert "Make sure that ActiveSupport::Logger includes the Logger extensions f...David Heinemeier Hansson2012-12-214-21/+30
* Make sure that ActiveSupport::Logger includes the Logger extensions from core...David Heinemeier Hansson2012-12-214-30/+21
* Add ActiveSupport::Logger#silence that works the same as the old Logger#silen...David Heinemeier Hansson2012-12-215-20/+45
* 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
| * 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
| * 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
* | Wrap table creation in a transaction.Rafael Mendonça França2012-12-211-6/+8
* | 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: 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 conventionsFrancesco Rodriguez2012-12-2017-438/+440
* | | | Fix CHANGELOG entry about scope changeGuillermo Iguaran2012-12-201-1/+1
|/ / /
* | | Fix Action Mailer changelog indenation to match other changelogsCarlos Antonio da Silva2012-12-194-27/+29
* | | 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 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
* | | Integrate Journey into Action DispatchAndrew White2012-12-1946-6/+3970
* | | Merge pull request #8559 from mshytikov/runner_method_is_slow_with_thread_safeJosé Valim2012-12-191-1/+10
|\ \ \
| * | | 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
* | | Merge pull request #8522 from senny/3489_index_names_on_copyCarlos Antonio da Silva2012-12-193-2/+16
|\ \ \
| * | | 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 databaseYasuo Honda2012-12-191-2/+1
| |/ / /
* | | | Merge pull request #8523 from reednj77/remove-mail-to-encodingDavid Heinemeier Hansson2012-12-183-110/+17
|\ \ \ \
| * | | | Remove obfuscation support from mail_to helperNick Reed2012-12-183-110/+17
|/ / / /
* | | | Merge pull request #8552 from frodsan/concerned_testsCarlos Antonio da Silva2012-12-182-2/+5
|\ \ \ \ | |/ / / |/| | |
| * | | 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
* | | Revert "use File.basename to get the filename minus .yml"Aaron Patterson2012-12-181-4/+3
* | | Revert "Merge pull request #7587 from elia/fix-too-eager-loading"Rafael Mendonça França2012-12-183-17/+6
* | | Merge pull request #8548 from garysweaver/postgresql_fallback_to_disable_user...Rafael Mendonça França2012-12-182-4/+17
|\ \ \
| * | | #5523 Add ability for postgresql adapter to disable user triggers in disable_...Gary S. Weaver2012-12-182-4/+17
|/ / /
* | | 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
| |\ \ \