aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | 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]
| * | | | | | | | | | | | | | | | Add link to API documentationKirill Zhuravlov2016-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a link to http://api.rubyonrails.org/classes/ActionController.html in the beginning of an article.
* | | | | | | | | | | | | | | | | Merge pull request #28390 from bogdanvlviv/fix-typo-in-security-guideVipul A M2017-03-121-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in the security guide
| * | | | | | | | | | | | | | | | | Fix typo in the security guidebogdanvlviv2017-03-121-2/+2
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | | AS:Cache:MemoryStore doc fixes [ci skip] (#28389)Vipul A M2017-03-121-1/+1
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #27051 from devonestes/adding-cache-clear-docsVipul A M2017-03-121-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | Add missing documentation for MemoryStore#clear [ci skip]
| * | | | | | | | | | | | | | | | Add missing documentation for MemoryStore#clear [ci skip]Devon Estes2016-11-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were missing some form of documentation for this method, so I've gone ahead and added some!
* | | | | | | | | | | | | | | | | Merge pull request #28378 from y-yagi/use_correct_variable_in_reverse_merge_testEileen M. Uchitelle2017-03-111-8/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | Use correct value in `reverse_merge` test
| * | | | | | | | | | | | | | | | Use correct value in `reverse_merge` testyuuji.yaginuma2017-03-111-8/+4
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #28380 from shime/docs-actionpack-apiAndrew White2017-03-111-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | [docs] remove unnecessary sentence
| * | | | | | | | | | | | | | | | [docs] remove unnecessary sentenceHrvoje Šimić2017-03-111-4/+3
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* / / / / / / / / / / / / / / / Fix indentation and formatting in CHANGELOGs [ci skip]Ryuta Kamizono2017-03-112-19/+19
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Add @takkanm credits in the changelog [ci skip]Rafael Mendonça França2017-03-101-1/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #28355 from Edouard-chin/reversemerge-for-strongparametersRafael Mendonça França2017-03-103-0/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added `reverse_merge`/`reverse_merge!` to AC::Parameters: [Rafael Mendonça França + Mitsutaka Mimura]
| * | | | | | | | | | | | | | | Added `reverse_merge`/`reverse_merge!` to AC::Parameters:Edouard CHIN2017-03-093-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This PR adds the `reverse_merge` and `reverse_merge!` method to `ActionController::Parameters` - Fixes #28353
* | | | | | | | | | | | | | | | Merge pull request #28373 from godfat/fix-cache-middleware-with-throwRafael França2017-03-102-4/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure local cache cleared even it's throwing:
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-21 18:37:30 +0000