aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Restore 5.minutes changed in #28204Andrew White2017-03-151-1/+1
|
* Use better duration aliases in testsAndrew White2017-03-151-2/+2
|
* Remove implicit coercion deprecation of durationsAndrew White2017-03-153-35/+211
| | | | | | | | | | | | | | | | In #28204 we deprecated implicit conversion of durations to a numeric which represented the number of seconds in the duration because of unwanted side effects with calculations on durations and dates. This unfortunately had the side effect of forcing a explicit cast when configuring third-party libraries like expiration in Redis, e.g: redis.expire("foo", 5.minutes) To work around this we've removed the deprecation and added a private class that wraps the numeric and can perform calculation involving durations and ensure that they remain a duration irrespective of the order of operations.
* Merge pull request #28423 from eugeneius/rm_txnRichard Schneeman2017-03-152-2/+0
|\ | | | | Remove unused `@txn` variable
| * Remove unused `@txn` variableEugene Kenny2017-03-152-2/+0
| | | | | | | | | | | | This was added in c24c885209ac2334dc6f798c394a821ee270bec6, removed in b89ffe7f0047eb614e42232a21201b317b880755, and then (unintentionally?) reintroduced in 2d7ae1b08ee2a10b12cbfeef3a6cc6da55b57df6.
* | Merge pull request #28409 from y-yagi/make_destroy_command_work_within_enginesEileen M. Uchitelle2017-03-152-2/+57
|\ \ | | | | | | Make destroy command work within engines
| * | Make destroy command work within enginesyuuji.yaginuma2017-03-142-2/+57
| | | | | | | | | | | | | | | Instead of calling methods of Rails.application directly, we need to use a method that is considered for the rails engine.
* | | Merge pull request #28422 from ↵Kasper Timm Hansen2017-03-151-7/+7
|\ \ \ | |_|/ |/| | | | | | | | y-yagi/rename_app_update_test_to_more_appropriate_name Rename test of `app:update` to more appropriate name
| * | Rename test of `app:update` to more appropriate nameyuuji.yaginuma2017-03-151-7/+7
| |/ | | | | | | | | `rails:update` was changed to `app:update` in 6fb31638c8b61731103d4963272755b217a2df87. Therefore, I think that it is better that the test name is also `app_update`.
* | Don't cast to float unnecessarilyAndrew White2017-03-151-2/+2
| | | | | | | | Adding durations to `Time` instances is perfectly okay.
* | Merge pull request #28420 from claudiob/changelog-skip-coffeeClaudio B2017-03-141-0/+4
|\ \ | | | | | | Add CHANGELOG entry for --skip-coffee [ci skip]
| * | Add CHANGELOG entry for --skip-coffee [ci skip]claudiob2017-03-141-0/+4
|/ / | | | | | | Was added in #25248 by @bluesh55
* | Merge pull request #28410 from fphilipe/remove-obsolete-warning-in-guidesRyuta Kamizono2017-03-141-3/+0
|\ \ | | | | | | Remove obsolete warning about regular expression
| * | Remove obsolete warning about regular expressionPhilipe Fatio2017-03-141-3/+0
|/ / | | | | | | | | | | | | | | | | | | This warning became obsolete when the regular expression was changed to use `\z` instead of `\Z` in fce9c4e5e1ecb31cff2ca43a04fbe332816c3c45. "-1234\n" =~ /\A[+-]?\d+\Z/ => 0 "-1234\n" =~ /\A[+-]?\d+\z/ => nil [ci skip]
* | Revert "Merge pull request #28369 from ↵Matthew Draper2017-03-141-2/+2
| | | | | | | | | | | | | | | | | | mylake/reduce-postgresql-adapter-memory-bloat" This reverts commit 192db64452d148c7b51713979459e38407380dc6, reversing changes made to 9893955363cf6358556ed3b36f4538d5b54e9d17. We can't sacrifice correctness for performance.
* | Merge pull request #28407 from claudiob/changelog-skip-pipelineRichard Schneeman2017-03-131-0/+17
|\ \ | | | | | | Add CHANGELOG for #26226 [ci skip]
| * | 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
|\ \ \ | | | | | | | | 500x memory reduction of 10k schemas for postgresql adapter
| * | | Use “distinct” to filter redundant types from pg_typeto reduce memory ↵mylake2017-03-101-2/+2
| | | | | | | | | | | | | | | | bloat especially in multi-schema structure database
* | | | Merge pull request #28356 from jasl/patch-1Rafael França2017-03-131-9/+1
|\ \ \ \ | | | | | | | | | | Remove non-exists method delegation
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Extract `data_source_sql` to refactor data source statements
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Lint activesupport/CHANGELOG.mdJon Moss2017-03-131-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Small grammar change + new line for "fixes"Jon Moss2017-03-131-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Small grammar changeJon Moss2017-03-131-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reads easier, and removes extra tick marks. [ci skip]
* | | | | | Merge pull request #28404 from olimart/masterJon Moss2017-03-131-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix Typo [ci skip]
| * | | | | | Fix Typo [ci skip]Olivier2017-03-131-1/+1
|/ / / / / / | | | | | | | | | | | | Arcticle --> Article
* | | | | | Fix HTTPS grammarJon Moss2017-03-131-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #28381 from shime/docs-action-controller-baseVipul A M2017-03-1321-55/+55
|\ \ \ \ \ \ | | | | | | | | | | | | | | [docs] fix ActionController docs
| * | | | | | [docs] fix ActionController documentationHrvoje Šimić2017-03-1221-55/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge pull request #28385 from javan/actioncable/fix-npm-packageGuillermo Iguaran2017-03-133-1/+38
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Restore action_cable.js UMD module support. Fixes #28366
| * | | | | | 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)
| * | | | | | | Dont always display inline screenshots in system testing (#28133)Renaud Chaput2017-03-111-5/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3 output types are supported: - simple: only display the screenshot path - artifact: display the screenshot in the terminal, using the artifact protocol (supported by some CI) - inline (default): display the screenshot in the terminal, inline (supported by some terminals) You can force the output type by setting the `RAILS_SYSTEM_TESTING_SCREENSHOT` environment variable
* | | | | | | | Merge pull request #28017 from mtsmfm/suppress-dep-warnMatthew Draper2017-03-133-0/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Suppress deprecation warning `implementing to_yaml is deprecated`
| * | | | | | | | 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_defaults
| * | | | | | | | Fixes ActionController::Rendering#with_defaultsalpaca-tc2017-03-123-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `env` is undefined.
* | | | | | | | | Merge pull request #28371 from kamipo/simplify_countAndrew White2017-03-121-7/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Simply forward `Calculations#count` to `Enumerable#count`
| * | | | | | | | | Simply forward `Calculations#count` to `Enumerable#count`Ryuta Kamizono2017-03-101-7/+4
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up of #24203. Since b644964b `ActiveRecord::Relation` includes `Enumerable` so it is enough to call `super` simply.
* | | | | | | | | Fix weird documentation lineJon Moss2017-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Merge pull request #28372 from kamipo/delegate_as_jsonAndrew White2017-03-123-6/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Simply delegate `as_json` to `records`
| * | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lots of grammar, etc fixes. [ci skip]
* | | | | | | | | First editing pass on "Active Model Basics" guideJon Moss2017-03-121-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lots of grammar, etc fixes. [ci skip]
* | | | | | | | | 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 documentation [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 02:52:39 +0000