aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use better duration aliases in testsAndrew White2017-03-151-2/+2
* Remove implicit coercion deprecation of durationsAndrew White2017-03-153-35/+211
* Merge pull request #28423 from eugeneius/rm_txnRichard Schneeman2017-03-152-2/+0
|\
| * Remove unused `@txn` variableEugene Kenny2017-03-152-2/+0
* | Merge pull request #28409 from y-yagi/make_destroy_command_work_within_enginesEileen M. Uchitelle2017-03-152-2/+57
|\ \
| * | Make destroy command work within enginesyuuji.yaginuma2017-03-142-2/+57
* | | Merge pull request #28422 from y-yagi/rename_app_update_test_to_more_appropri...Kasper Timm Hansen2017-03-151-7/+7
|\ \ \ | |_|/ |/| |
| * | Rename test of `app:update` to more appropriate nameyuuji.yaginuma2017-03-151-7/+7
| |/
* | Don't cast to float unnecessarilyAndrew White2017-03-151-2/+2
* | Merge pull request #28420 from claudiob/changelog-skip-coffeeClaudio B2017-03-141-0/+4
|\ \
| * | Add CHANGELOG entry for --skip-coffee [ci skip]claudiob2017-03-141-0/+4
|/ /
* | Merge pull request #28410 from fphilipe/remove-obsolete-warning-in-guidesRyuta Kamizono2017-03-141-3/+0
|\ \
| * | Remove obsolete warning about regular expressionPhilipe Fatio2017-03-141-3/+0
|/ /
* | Revert "Merge pull request #28369 from mylake/reduce-postgresql-adapter-memor...Matthew Draper2017-03-141-2/+2
* | Merge pull request #28407 from claudiob/changelog-skip-pipelineRichard Schneeman2017-03-131-0/+17
|\ \
| * | Add CHANGELOG for #26226 [ci skip]claudiob2017-03-131-0/+17
* | | Merge pull request #28369 from mylake/reduce-postgresql-adapter-memory-bloatRafael França2017-03-131-2/+2
|\ \ \
| * | | Use “distinct” to filter redundant types from pg_typeto reduce memory blo...mylake2017-03-101-2/+2
* | | | Merge pull request #28356 from jasl/patch-1Rafael França2017-03-131-9/+1
|\ \ \ \
| * | | | Remove non-exists method delegation and correct docjasl2017-03-111-9/+1
* | | | | Merge pull request #28068 from kamipo/refactor_data_sourcesRafael França2017-03-138-205/+156
|\ \ \ \ \
| * | | | | Prefer `USING (column_list)` for joining information_schemaRyuta Kamizono2017-02-251-3/+1
| * | | | | Extract `data_source_sql` to refactor data source statementsRyuta Kamizono2017-02-208-202/+155
* | | | | | Move "fixes" to a new lineJon Moss2017-03-131-1/+3
* | | | | | Lint activesupport/CHANGELOG.mdJon Moss2017-03-131-8/+10
* | | | | | Small grammar change + new line for "fixes"Jon Moss2017-03-131-2/+4
* | | | | | Small grammar changeJon Moss2017-03-131-3/+1
* | | | | | Merge pull request #28404 from olimart/masterJon Moss2017-03-131-1/+1
|\ \ \ \ \ \
| * | | | | | Fix Typo [ci skip]Olivier2017-03-131-1/+1
|/ / / / / /
* | | | | | Fix HTTPS grammarJon Moss2017-03-131-4/+4
* | | | | | Merge pull request #28381 from shime/docs-action-controller-baseVipul A M2017-03-1321-55/+55
|\ \ \ \ \ \
| * | | | | | [docs] fix ActionController documentationHrvoje Šimić2017-03-1221-55/+55
* | | | | | | Merge pull request #28385 from javan/actioncable/fix-npm-packageGuillermo Iguaran2017-03-133-1/+38
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Restore action_cable.js UMD module support. Fixes #28366Javan Makhmali2017-03-113-1/+38
* | | | | | | Merge pull request #28185 from renchap/system-testing-screenshot-outputEileen M. Uchitelle2017-03-131-5/+34
|\ \ \ \ \ \ \
| * | | | | | | Dont always display inline screenshots in system testing (#28133)Renaud Chaput2017-03-111-5/+34
* | | | | | | | Merge pull request #28017 from mtsmfm/suppress-dep-warnMatthew Draper2017-03-133-0/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Suppress deprecation warning `implementing to_yaml is deprecated`Fumiaki MATSUSHIMA2017-02-153-0/+6
* | | | | | | | | Merge pull request #28352 from alpaca-tc/fixes_renderer_with_defaultsAkira Matsuda2017-03-133-1/+17
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Fixes ActionController::Rendering#with_defaultsalpaca-tc2017-03-123-1/+17
* | | | | | | | | Merge pull request #28371 from kamipo/simplify_countAndrew White2017-03-121-7/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Simply forward `Calculations#count` to `Enumerable#count`Ryuta Kamizono2017-03-101-7/+4
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Fix weird documentation lineJon Moss2017-03-121-1/+1
* | | | | | | | | Merge pull request #28372 from kamipo/delegate_as_jsonAndrew White2017-03-123-6/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Simply delegate `as_json` to `records`Ryuta Kamizono2017-03-103-6/+2
| |/ / / / / / / /
* | | | | | | | | Second editing pass on "Active Model Basics" guideJon Moss2017-03-121-16/+18
* | | | | | | | | First editing pass on "Active Model Basics" guideJon Moss2017-03-121-11/+12
* | | | | | | | | Add link to mentioned API [ci skip] (#28392)Vipul A M2017-03-121-1/+1
* | | | | | | | | Merge pull request #27152 from tjai89/patch-5Vipul A M2017-03-121-1/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Add link to API documentationKirill Zhuravlov2016-11-231-1/+1