aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* contrib guide: documents guidelines for running the test suiteXavier Noria2013-03-281-0/+11
* contrib guide: documents how to generate a --dev applicationXavier Noria2013-03-281-0/+16
* Merge pull request #9977 from vipulnsward/fix_column_test_typoRafael Mendonça França2013-03-281-3/+3
|\
| * anual_salary => annual_salaryVipul A M2013-03-281-3/+3
|/
* Merge pull request #9974 from prathamesh-sonpatki/change_logSteve Klabnik2013-03-281-1/+1
|\
| * Removed unused variable in procPrathamesh Sonpatki2013-03-281-1/+1
|/
* Merge pull request #9972 from divineforest/fix-overriden-typoRafael Mendonça França2013-03-284-5/+5
|\
| * Fix typo: overriden => overriDDenAlexander Balashov2013-03-284-5/+5
* | Merge pull request #9973 from prathamesh-sonpatki/AR-typosRafael Mendonça França2013-03-283-5/+5
|\ \
| * | Fixed typos in ActiveRecordPrathamesh Sonpatki2013-03-283-5/+5
|/ /
* | Merge pull request #9970 from divineforest/fix-typoRafael Mendonça França2013-03-281-1/+1
|\ \
| * | Fix typoAlexander Balashov2013-03-281-1/+1
| |/
* | Use snake case variable names, stick with the conventionCarlos Antonio da Silva2013-03-281-13/+13
* | Merge pull request #9967 from choudhuryanupam/fix_actionpack_test_casesCarlos Antonio da Silva2013-03-282-3/+3
|\ \
| * | Refactored to remove unused variableAnupam Choudhury2013-03-282-3/+3
* | | Merge pull request #9963 from obrie/fix/after_create_updatesCarlos Antonio da Silva2013-03-282-1/+17
|\ \ \ | |_|/ |/| |
| * | Fix updates not working within after_create hooksAaron Pfeifer2013-03-272-1/+17
* | | Merge pull request #9968 from choudhuryanupam/fix_typo_n_grammarCarlos Antonio da Silva2013-03-281-1/+1
|\ \ \ | |_|/ |/| |
| * | Fixed grammarAnupam Choudhury2013-03-281-1/+1
|/ /
* | determine_constant_from_test_name does not swallow NoMethodErrors [Yves Senn]Xavier Noria2013-03-282-0/+12
* | Add coffee-rails and javascript runtime to gemfile if skip_javascript isRafael Mendonça França2013-03-281-2/+9
* | Merge pull request #9944 from where/rebased-fulltext-spacialRafael Mendonça França2013-03-2713-37/+108
|\ \
| * | Add support for FULLTEXT and SPATIAL indexes using the :type flag for MySQL.Ken Mazaika2013-03-2713-37/+108
|/ /
* | Merge pull request #9964 from where/using-schema-dumpRafael Mendonça França2013-03-273-2/+11
|\ \ | |/ |/|
| * Dump the 'using' options for a SQL index into the schema.Ken Mazaika2013-03-273-2/+11
|/
* Merge pull request #9523 from stopdropandrew/Instrumenter#instrument-yields-p...Rafael Mendonça França2013-03-274-2/+16
|\
| * ActiveSupport::Notifications::Instrumenter#instrument should yieldstopdropandrew2013-03-024-3/+16
* | Merge pull request #9955 from rubys/cleanup_app_gemfileRafael Mendonça França2013-03-271-17/+7
|\ \
| * | Remove buggy and unnecessary logicSam Ruby2013-03-271-7/+0
| * | Cosmetic cleanup of generated GemfileSam Ruby2013-03-271-17/+14
* | | Fix syntax errorRafael Mendonça França2013-03-271-1/+0
* | | Merge pull request #9274 from KrzysiekJ/spaces_in_scope_namesRafael Mendonça França2013-03-272-5/+17
|\ \ \ | |/ / |/| |
| * | Use define_method when method name contains weird characters.Krzysztof Jurewicz2013-03-182-5/+17
* | | Merge pull request #8458 from lucisferre/improve-layout-override-fallback-beh...Rafael Mendonça França2013-03-274-5/+68
|\ \ \
| * | | Provides standard layout lookup behavior for method and proc casesChris Nicola2013-03-274-5/+67
* | | | Merge pull request #9954 from neerajdotname/space_after_entirelyRafael Mendonça França2013-03-271-1/+1
|\ \ \ \
| * | | | entirelyby => 'entirely by'Neeraj Singh2013-03-271-1/+1
|/ / / /
* | | | Merge pull request #9949 from vipulnsward/drop_yaml_error_constantRafael Mendonça França2013-03-272-4/+2
|\ \ \ \
| * | | | drop errors constantVipul A M2013-03-272-4/+2
* | | | | Merge pull request #9952 from prathamesh-sonpatki/AR-typosRafael Mendonça França2013-03-275-5/+5
|\ \ \ \ \
| * | | | | Fixed typos in activerecordPrathamesh Sonpatki2013-03-275-5/+5
|/ / / / /
* | | | | Merge pull request #9947 from senny/strong_params_doc_for_complex_formsRafael Mendonça França2013-03-271-1/+25
|\ \ \ \ \
| * | | | | mention strong parameters in complex forms section of the guides.Yves Senn2013-03-271-1/+25
| |/ / / /
* | | | | Merge pull request #8368 from SamSaffron/masterRafael Mendonça França2013-03-273-3/+75
|\ \ \ \ \
| * | | | | Make connection_handler overridable per threadSam Saffron2013-03-273-3/+75
* | | | | | Use thor master since 0.18.0 has a regressionRafael Mendonça França2013-03-271-0/+1
| |/ / / / |/| | | |
* | | | | Merge pull request #9945 from vipulnsward/drop_var_in_validationsCarlos Antonio da Silva2013-03-271-2/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | drop variable assignment in validationsVipul A M2013-03-271-2/+1
|/ / / /
* | | | Merge pull request #9876 from macksmind/restore_cols_dropped_by_hstore_testRafael Mendonça França2013-03-261-15/+5
|\ \ \ \
| * | | | Combine tests and restore columns dropped by hstore testingMack Earnhardt2013-03-261-15/+5