aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #29064 from boykoc/revenge-of-the-fixturesEileen M. Uchitelle2017-05-121-1/+1
|\
| * [ci skip] Mailer fixtures in Testing guide.Cody Boyko2017-05-121-1/+1
|/
* Merge pull request #29062 from eileencodes/force-encoding-to-original-string-...Eileen M. Uchitelle2017-05-122-0/+7
|\
| * Maintain original encoding from patheileencodes2017-05-122-0/+7
* | Merge pull request #28919 from meinac/fix_ambigious_exception_message_of_sele...Kasper Timm Hansen2017-05-121-1/+1
|\ \
| * | Fix ambigious error message of select query methodMehmet Emin INAC2017-05-081-1/+1
* | | Merge pull request #29029 from timolehto/masterRafael França2017-05-111-1/+1
|\ \ \
| * | | rake -T should load development env by default, not testTimo Kilpilehto2017-05-101-1/+1
* | | | Merge pull request #29034 from peterjm/handle_loops_in_exception_handlingRafael França2017-05-112-3/+41
|\ \ \ \
| * | | | handle loops in the cause chain in Rescuable#rescue_with_handlerPeter McCracken2017-05-102-3/+41
* | | | | Merge pull request #29040 from eugeneius/parameters_delete_blockAaron Patterson2017-05-112-2/+23
|\ \ \ \ \
| * | | | | Pass block in ActionController::Parameters#deleteEugene Kenny2017-05-102-2/+23
| | |/ / / | |/| | |
* | | | | Merge pull request #29043 from kamipo/dont_eager_loading_if_unneeded_for_existsAaron Patterson2017-05-113-4/+6
|\ \ \ \ \
| * | | | | Don't eager loading if unneeded for `FinderMethods#exists?`Ryuta Kamizono2017-05-113-4/+6
| |/ / / /
* | | | | Defer loading each DB Tasks class from AR DatabaseTasksAkira Matsuda2017-05-111-6/+6
* | | | | Merge pull request #29044 from koic/fix_typo_in_guideVipul A M2017-05-111-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix a typo in guide [ci skip]Koichi ITO2017-05-111-1/+1
|/ / / /
* | | | Merge pull request #29022 from y-yagi/allow_to_receive_arbitrary_arguments_in...Matthew Draper2017-05-101-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Allow to receive arbitrary arguments in `aggregated_results`yuuji.yaginuma2017-05-101-1/+1
* | | | Merge pull request #28995 from jcoyne/update_capybaraMatthew Draper2017-05-093-8/+8
|\ \ \ \
| * | | | Allow capybara minor releasesJustin Coyne2017-05-053-8/+8
| | |/ / | |/| |
* | | | Merge pull request #28240 from kreintjes/fix/autoloading-sti-guideMatthew Draper2017-05-091-9/+8
|\ \ \ \
| * | | | Correct Autoloading and STI guide (issue #26994)Kevin Reintjes2017-04-061-9/+8
* | | | | Merge pull request #29012 from y-yagi/fix_link_to_assert_nothing_raised_docRobin Dupret2017-05-081-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix link to `assert_nothing_raised` doc [ci skip]yuuji.yaginuma2017-05-081-1/+1
|/ / / /
* | | | Merge pull request #29005 from kamipo/should_escape_meta_chars_in_regexpKasper Timm Hansen2017-05-0730-118/+118
|\ \ \ \
| * | | | Should escape meta characters in regexpRyuta Kamizono2017-05-0730-118/+118
|/ / / /
* | | | Merge pull request #29002 from kamipo/fix_warning_ambiguous_first_argumentMatthew Draper2017-05-071-2/+2
|\ \ \ \
| * | | | Fix `warning: ambiguous first argument`Ryuta Kamizono2017-05-061-2/+2
|/ / / /
* | | | Merge pull request #28989 from matthewd/quoted_id-deprecationMatthew Draper2017-05-062-2/+22
|\ \ \ \
| * | | | Clarify deprecation message for #quoted_idMatthew Draper2017-05-052-2/+22
* | | | | Merge pull request #28999 from kamipo/remove_unused_delegation_test_call_methodRafael França2017-05-051-27/+7
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove unused `DelegationTest#call_method`Ryuta Kamizono2017-05-061-27/+7
|/ / / /
* | | | Merge pull request #28981 from kamipo/dont_use_arel_engineMatthew Draper2017-05-054-10/+7
|\ \ \ \
| * | | | Don't pass `arel.engine` to `Arel::SelectManager.new`Ryuta Kamizono2017-05-054-10/+7
|/ / / /
* | | | Merge pull request #28986 from tjschuck/delegate_missing_to_doc_fixesRafael França2017-05-042-28/+23
|\ \ \ \
| * | | | Update test names to match method nameT.J. Schuck2017-05-041-6/+6
| * | | | Assorted delegate_missing_to doc fixesT.J. Schuck2017-05-041-22/+17
| |/ / /
* | | | Merge pull request #28983 from kamipo/remove_useless_target_records_from_asso...Rafael França2017-05-041-11/+3
|\ \ \ \
| * | | | Remove useless `target_records_from_association`Ryuta Kamizono2017-05-041-11/+3
* | | | | Merge pull request #28984 from yahonda/mysql2_046Rafael França2017-05-041-3/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Use mysql2 0.4.6 to suport MySQL 8.0.1Yasuo Honda2017-05-041-3/+3
* | | | | Avoid rubygems 2.6.12 for nowMatthew Draper2017-05-041-1/+1
* | | | | Merge pull request #28979 from y-yagi/build_package_json_in_create_root_filesRafael França2017-05-031-4/+5
|\ \ \ \ \
| * | | | | Move `package.json` creation to `create_root_files`yuuji.yaginuma2017-05-041-4/+5
|/ / / / /
* | | | | Merge pull request #28337 from riseshia/patch-1Rafael França2017-05-031-1/+1
|\ \ \ \ \
| * | | | | Fix to use correct path with language on guideShia2017-03-081-1/+1
* | | | | | Merge pull request #28978 from riseshia/patch-2Rafael França2017-05-031-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Use target language's document.yaml [ci skip]Shia2017-05-041-1/+1
|/ / / / /
* | | | | Merge pull request #28976 from kamipo/should_test_bound_attributesRafael França2017-05-031-8/+12
|\ \ \ \ \