aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix test name and refactor fake timezones creation in form options testCarlos Antonio da Silva2013-02-211-3/+3
* Remove not necessary changelog about time zone array mutationCarlos Antonio da Silva2013-02-211-8/+0
* tweaks to the AP changelog [ci skip]Xavier Noria2013-02-211-42/+27
* Merge pull request #9358 from iwiznia/patch-1Xavier Noria2013-02-211-3/+3
|\
| * Update railties/lib/rails/application/configuration.rbiwiznia2013-02-211-3/+3
| * Update railties/lib/rails/application/configuration.rbiwiznia2013-02-211-1/+1
|/
* Merge pull request #9354 from NARKOZ/remove-warningsSteve Klabnik2013-02-211-2/+2
|\
| * remove assigned but unused variable warningNihad Abbasov2013-02-211-2/+2
* | Merge pull request #9357 from fabiokr/rack_test_uploaded_fileXavier Noria2013-02-212-4/+6
|\ \ | |/ |/|
| * Rack::Test::UploadedFile is a permitted scalarFabio Kreusch2013-02-212-4/+6
|/
* Merge pull request #9348 from schuetzm/doc_no_indices_with_create_join_tableXavier Noria2013-02-212-0/+18
|\
| * Indent comment block by two spaces.Marc Schütz2013-02-211-4/+4
| * Add more documentation for create_join_table.Marc Schütz2013-02-202-0/+18
* | Merge pull request #9352 from senny/remove_uncommented_boot_testCarlos Antonio da Silva2013-02-211-20/+0
|\ \
| * | remove uncommented railties boot_test.rbYves Senn2013-02-211-20/+0
* | | Fix warningRafael Mendonça França2013-02-211-1/+1
| |/ |/|
* | ActiveRecord -> Active Record [ci skip]Xavier Noria2013-02-201-1/+1
* | Merge pull request #9345 from wangjohn/change_name_of_query_method_argument_c...Rafael Mendonça França2013-02-201-10/+10
|\ \
| * | Renaming the check_empty_arguments method to something more descriptive.wangjohn2013-02-201-10/+10
* | | removes relation bang methods from the AR changelog [ci skip]Xavier Noria2013-02-201-12/+0
* | | removes some remaining relation bang methods documentation [ci skip]Xavier Noria2013-02-201-3/+0
* | | puts a lambda around a default scope [ci skip]Xavier Noria2013-02-201-1/+1
* | | adds an example in the docs of #not with multiple conditions [ci skip]Xavier Noria2013-02-201-4/+8
* | | database.yml -> config/database.yml [ci skip]Xavier Noria2013-02-201-1/+1
* | | Revert "Merge pull request #4803 from lucascaton/master"Santiago Pastorino2013-02-203-5/+3
| |/ |/|
* | Skip failing test and add a FIXME noteRafael Mendonça França2013-02-201-0/+2
* | Merge pull request #9344 from senny/changelog_cleanupRafael Mendonça França2013-02-201-4/+4
|\ \
| * | unify AR changelog entries [ci skip]Yves Senn2013-02-201-4/+4
|/ /
* | Merge pull request #8645 from senny/rename_index_on_rename_columnRafael Mendonça França2013-02-207-8/+73
|\ \
| * | also rename indexes when a table or column is renamedYves Senn2013-02-207-8/+73
|/ /
* | moves the new :nsec date format to the Active Support changelog [ci skip]Xavier Noria2013-02-202-6/+5
* | revises the documentation of AR::Base.cache_timestamp_format [ci skip]Xavier Noria2013-02-201-2/+4
|/
* Merge pull request #8613 from senny/8264_character_limit_for_indicesRafael Mendonça França2013-02-206-14/+69
|\
| * reserve less chars for internal sqlite3 operationsYves Senn2013-02-201-7/+7
| * reserve index name chars for internal rails operationsYves Senn2013-02-206-9/+64
|/
* Merge pull request #9332 from wangjohn/adding_documentation_to_error_raising_...Rafael Mendonça França2013-02-203-15/+45
|\
| * Added comments about the check_empty_arguments method which is calledwangjohn2013-02-203-15/+45
* | Merge pull request #9342 from hone/db_migrate_with_database_urlRafael Mendonça França2013-02-201-1/+1
|\ \
| * | make type_cast_value a class level methodTerence Lee2013-02-211-1/+1
| |/
* | Merge pull request #9068 from wangjohn/transaction_callback_patchRafael Mendonça França2013-02-206-6/+89
|\ \
| * | Reduced memory leak problem in transactions by lazily updating AR objects wit...wangjohn2013-02-206-6/+89
| |/
* | Merge pull request #9341 from senny/move_precompiled_asset_config_to_applicationRafael Mendonça França2013-02-203-6/+10
|\ \ | |/ |/|
| * move config.assets.precompile into config/application.rbYves Senn2013-02-203-6/+10
* | Merge pull request #9120 from hone/db_migrate_with_database_urlRafael Mendonça França2013-02-205-10/+24
|\ \ | |/ |/|
| * update changelogTerence Lee2013-02-211-0/+3
| * run the load_structure test in the test environmentTerence Lee2013-02-211-3/+10
| * test DATABASE_URL without database.yml aroundTerence Lee2013-02-211-0/+2
| * standardize database_configuration to a hashTerence Lee2013-02-213-7/+9
|/
* Merge pull request #9328 from sikachu/ps-remove-xml-parserGuillermo Iguaran2013-02-205-342/+31
|\
| * Remove XML Parser from ActionDispatchPrem Sichanugrist2013-02-205-342/+31
|/