aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #22493 from rails/rm-fix-testsRafael França2015-12-044-14/+6
|\
| * Disable FileEventedUpdateChecker for nowRafael Mendonça França2015-12-041-5/+1
| * Mac OS X use /private as directory to temp fileRafael Mendonça França2015-12-041-1/+1
| * Remove test_files check from plugin checksRafael Mendonça França2015-12-041-4/+0
| * Remove warningsRafael Mendonça França2015-12-041-4/+4
|/
* Merge pull request #22476 from claudiob/comment-premClaudio B2015-12-022-2/+7
|\
| * Remove old comment about AC::Parameters>subclassesclaudiob2015-12-022-2/+7
|/
* Merge pull request #22469 from merhard/fix_custom_file_loader_testRafael França2015-12-021-0/+2
|\
| * Fix failing test using custom file watcherMatthew Erhard2015-12-021-0/+2
* | Merge pull request #22471 from merhard/railties_tests_actually_fail_on_travisRafael França2015-12-021-21/+8
|\ \ | |/ |/|
| * Revert "don't start a new process for every test file"Matthew Erhard2015-12-021-21/+8
|/
* don't rely on the columns hash to get defaults. follow-up to #17169.Yves Senn2015-12-022-7/+25
* add `ActiveRecord::Base.has_attribute?`Yves Senn2015-12-023-2/+27
* tests, pluralize singular table name.Yves Senn2015-12-021-1/+1
* Merge pull request #17169 from kuldeepaggarwal/fix-STI-default-typeYves Senn2015-12-023-9/+47
|\
| * STI cast new instances to `default type` on initialize.Kuldeep Aggarwal2015-12-023-0/+42
|/
* Merge pull request #22464 from pavlos/patch-1Claudio B2015-12-011-1/+1
|\
| * Update autoloading_and_reloading_constants.mdpavlos2015-12-011-1/+1
* | Ensure `Relation` responds to `shuffle`Sean Griffin2015-12-012-2/+2
|/
* Merge pull request #22343 from jeffminnear/patch-1Claudio B2015-12-011-2/+9
|\
| * Modify unscoped usage guide to include chainingJeff Minnear2015-11-301-2/+9
* | Merge pull request #22449 from dnagir/database_connection_messageYves Senn2015-12-011-1/+1
|\ \
| * | Explain the connection pool error message betterDmytrii Nagirniak2015-12-011-1/+1
* | | Merge pull request #22361 from grosser/grosser/rescueArthur Nogueira Neves2015-11-301-26/+19
|\ \ \
| * | | rescue memcached errors in a consistent wayMichael Grosser2015-11-291-26/+19
* | | | Merge pull request #22456 from chriskottom/fix-minitest-plugin-with-minitest-...Sean Griffin2015-11-302-1/+7
|\ \ \ \
| * | | | allow use of minitest-rails gem with test runnerChris Kottom2015-11-302-1/+7
|/ / / /
* | | | Merge pull request #22345 from GUI/fix-multi-schema-structure-dumpYves Senn2015-11-303-4/+10
|\ \ \ \
| * | | | Fix rake db:structure:dump on Postgres when multiple schemas are used.Nick Muerdter2015-11-193-4/+13
* | | | | Merge pull request #22451 from kamipo/refactor_abstract_adapter_initializeKasper Timm Hansen2015-11-304-8/+7
|\ \ \ \ \
| * | | | | Refactor `AbstractAdapter#initialize`Ryuta Kamizono2015-11-304-8/+7
* | | | | | Merge pull request #22452 from kamipo/fix_indentationArun Agrawal2015-11-301-7/+7
|\ \ \ \ \ \
| * | | | | | Fix indentation in CHANGELOG.md [ci skip]Ryuta Kamizono2015-11-301-7/+7
|/ / / / / /
* | | | | | Merge pull request #22363 from yui-knk/mv_ar_test_caseYves Senn2015-11-302-91/+94
|\ \ \ \ \ \
| * | | | | | Remove some bind related test cases from finder_test.rb to sanitize_test.rbyui-knk2015-11-212-91/+94
* | | | | | | Merge pull request #22427 from eliotsykes/validation-message-proc-docYves Senn2015-11-301-1/+30
|\ \ \ \ \ \ \
| * | | | | | | Document message validation option accepts ProcEliot Sykes2015-11-271-1/+30
* | | | | | | | Merge pull request #22373 from yui-knk/ad_constraintsYves Senn2015-11-301-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Add `Routing` namespace to point appropriate constantyui-knk2015-11-221-1/+1
* | | | | | | | Merge pull request #18155 from bogdan/collection_association_double_element_fixSean Griffin2015-11-293-4/+20
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Bugfix collection association #create method …Bogdan Gusiev2015-11-233-4/+20
* | | | | | | | Merge pull request #22444 from kamipo/connection_options_is_only_needed_for_m...Santiago Pastorino2015-11-293-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | `connection_options` is only needed for `MysqlAdapter`Ryuta Kamizono2015-11-293-3/+3
|/ / / / / / / /
* | | | | | | | Merge pull request #22443 from Wasserschlange/added_dollarsign_to_readmeXavier Noria2015-11-291-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Added dollarsign to the README.md for consistancyMichael H2015-11-281-4/+4
|/ / / / / / / /
* | | | | | | | Merge pull request #22283 from the-undefined/routes-error-singular-resourceArthur Nogueira Neves2015-11-281-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | [ci skip] add `controller:` argument to routing.mdthe-undefined2015-11-131-2/+2
* | | | | | | | | Merge pull request #22315 from takatoshiono/fix-configuring-docArthur Nogueira Neves2015-11-281-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix set_autoload_paths and set_load_path documentTakatoshi Ono2015-11-171-2/+2
* | | | | | | | | | Merge pull request #22371 from yui-knk/better_mount_errorArthur Nogueira Neves2015-11-282-7/+22
|\ \ \ \ \ \ \ \ \ \