aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge pull request #23156 from plentz/patch-1Guillermo Iguaran2016-01-211-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | updating secrets.yml template to use rails command instead of rake
| * | | | | | updating secrets.yml template to use rails command instead of rakeDiego Plentz2016-01-211-1/+1
|/ / / / / /
* | | | | | Merge pull request #23154 from sealocal/improve-docs-for-respond-toप्रथमेश Sonpatki2016-01-211-4/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Improve Docs for ActionController::MimeResponds#respond_to
| * | | | | | remove doc reference to ActionController::MimeResponds#respond_tosealocal2016-01-201-3/+0
| | | | | | |
| * | | | | | document simple example of ActionController::MimeResponds#respond_tosealocal2016-01-201-1/+9
|/ / / / / /
* | | | | | Merge pull request #23149 from maclover7/fix-23142Santiago Pastorino2016-01-214-1/+39
|\ \ \ \ \ \ | | | | | | | | | | | | | | Re-add ActionController::ApiRendering
| * | | | | | Re-add ActionController::ApiRenderingJon Moss2016-01-204-1/+39
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | - Fixes bug #23142. - Bug was occurring only with ActionController::API, because `_process_options` wasn't being run for API requests, even though it was being run for normal app requests.
* | | | | | Merge pull request #23150 from alxndr/guides-tweakJon Moss2016-01-201-3/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | insert newlines into code samples in Upgrading section of Asset Pipeline doc
| * | | | | insert newlines into code samplesAlexander2016-01-201-3/+5
|/ / / / / | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #23140 from rails/fix-search-for-custom-routesAaron Patterson2016-01-202-14/+83
|\ \ \ \ \ | | | | | | | | | | | | Fix marking of custom routes for Journey
| * | | | | Fix marking of custom routes for JourneyAndrew White2016-01-202-14/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Mapper build_path method marks routes where path parameters are part of a path segment as custom routes by altering the regular expression, e.g: get '/foo-:bar', to: 'foo#bar' There were some edge cases where certain constructs weren't being picked up and this commit fixes those. Fixes #23069.
* | | | | | Merge pull request #17573 from zerothabhishek/masterGodfrey Chan2016-01-205-10/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | Response etags to always be weak: Prefixed 'W/' to value returned by Act...
| * | | | | | Response etags to always be weak: Prefixed W/ to value returned by ↵abhishek2016-01-205-10/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionDispatch::Http::Cache::Response#etag= such that etags set in fresh_when and stale? are weak. For #17556.
* | | | | | | Merge pull request #23147 from maclover7/update-rf-commentRafael França2016-01-201-4/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Small doc update per RF [ci skip]
| * | | | | | | Small doc update per RF [ci skip]Jon Moss2016-01-201-4/+5
|/ / / / / / /
* | | | | | | Merge pull request #23135 from maclover7/add-22950-changelogJon Moss2016-01-201-0/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add CHANGELOG.md entry for #22950
| * | | | | | | Add CHANGELOG.md entry for #22950Jon Moss2016-01-201-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge pull request #23139 from ↵Rafael França2016-01-201-3/+3
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | gsamokovarov/after-create-update-destroy-commit-docs Fix the API documentation layout of after_*_commit
| * | | | | | | Fix the API documentation layout of after_*_commitGenadi Samokovarov2016-01-201-3/+3
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just noticed this on the [edge API]. [ci skip] [edge API]: http://edgeapi.rubyonrails.org/classes/ActiveRecord/Transactions/ClassMethods.html
* / / / / / / Revert "Remove literal? check to fix issue with prefixed optionals"eileencodes2016-01-202-13/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5d1b7c3b441654e8008dcd303f5367883ec660a6. The change here didn't actually fix the issue it was trying to fix, and this isn't the correct way to fix either issue. The problem is switching from the builder to grouping with find_all/regex is now very dependent on how you structure your path pattern.
* | | | | | Merge pull request #23130 from vipulnsward/html_safe_to_rawRafael França2016-01-2012-43/+43
|\ \ \ \ \ \ | | | | | | | | | | | | | | Changed html_safe to raw in AV
| * | | | | | html_safe is not supposed to be public API for AV. This change removes usage ↵Vipul A M2016-01-2012-43/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of html_safe in favour of raw() in AV helpers. Also changed usage of html_safe to make use of raw() instead so that the intended behaviour is verified with raw()
* | | | | | | Merge pull request #23129 from Amit-Thawait/masterप्रथमेश Sonpatki2016-01-201-4/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Pluralize counter_cache column name in example [ci skip]
| * | | | | | Pluralize counter_cache column name in example [ci skip]Amit Thawait2016-01-201-4/+4
|/ / / / / /
* | | | | | Merge pull request #22950 from maclover7/adapterize-storage-actioncableMatthew Draper2016-01-2028-74/+347
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Adapterize storage for ActionCable
| * | | | | | Fix code review commentsJon Moss2016-01-1815-55/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - adapter -> pubsub (re)rename internally - Change variable names to match method names - Add EventMachine `~> 1.0` as a runtime dependency of ActionCable - Refactor dependency loading for adapters
| * | | | | | Add em-hiredis and redis as default Gems for new applicationsJon Moss2016-01-182-0/+20
| | | | | | |
| * | | | | | Small PostgreSQL adapter refactors / cleanupJon Moss2016-01-182-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Escape the channel name when subscribing in PG - Refactor popping the queue to make it easier to read
| * | | | | | ActionCable::StorageAdapter ==> ActionCable::SubscriptionAdapterJon Moss2016-01-1811-21/+23
| | | | | | |
| * | | | | | All Redis deps are now optional, Postgres --> PostgreSQL adapterJon Moss2016-01-187-15/+17
| | | | | | |
| * | | | | | config_opts => cable, per @kaspthJon Moss2016-01-183-6/+7
| | | | | | |
| * | | | | | Listener no longer needs to be a singletonMatthew Draper2016-01-181-52/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now only create one adapter instance for the server, so it can hold the listener. This in turn allows the listener to get the PG connection from the adapter, which will be a good place to allow more flexible configuration.
| * | | | | | Tests passing and small refactoringJon Moss2016-01-187-37/+65
| | | | | | |
| * | | | | | Blanket unsubscribe doesn't appear to be usedMatthew Draper2016-01-181-6/+2
| | | | | | |
| * | | | | | Don't execute callbacks on our main listener threadMatthew Draper2016-01-181-1/+1
| | | | | | |
| * | | | | | Pull the action methods directly onto the adapterMatthew Draper2016-01-188-56/+51
| | | | | | |
| * | | | | | Add Postgres adapterJon Moss2016-01-183-0/+111
| | | | | | |
| * | | | | | Refactor storage_adapterJon Moss2016-01-181-11/+3
| | | | | | |
| * | | | | | Adapterize ActionCable storage and extract behaviorJon Moss2016-01-1817-50/+173
| | | | | | |
* | | | | | | Merge pull request #23111 from prathamesh-sonpatki/fix-changelogRafael França2016-01-201-1/+5
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Update CHANEGLOG for https://github.com/rails/rails/pull/20005 [ci skip]
| * | | | | | Update CHANEGLOG for https://github.com/rails/rails/pull/20005 [ci skip]Prathamesh Sonpatki2016-01-201-1/+5
|/ / / / / /
* | | | | | Revert "Its ideal to set Vary: Accept-Encoding, irrespective of whether ↵schneems2016-01-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gzipped version exists or not. This is helpful for CDN's to later distinguish assets, based on previous, current copies and introduced gzip version if any." This reverts commit 067c52f608568e35181830a5c1016e382650e655. Conversation: https://github.com/rails/rails/pull/23120#issuecomment-173007011
* | | | | | Add `ModelSchema::type_for_attribute` to the public APISean Griffin2016-01-191-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want this method to be the single canonical source of information about type metadata related to a model. This is the method I've been continuously recommending people use if they need this sort of access, as I have no plans to remove or change it at any point in the future. We can do ourselves a favor and get people to use this instead of relying on some other part of the internals that they shouldn't be by making this method public.
* | | | | | Merge pull request #23120 from vipulnsward/always-set-vary-for-static-assetsRichard Schneeman2016-01-192-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Its ideal to set Vary: Accept-Encoding, irrespective of whether gzipped or not
| * | | | | | Its ideal to set Vary: Accept-Encoding, irrespective of whether gzipped ↵Vipul A M2016-01-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | version exists or not. This is helpful for CDN's to later distinguish assets, based on previous, current copies and introduced gzip version if any. For ref: https://www.fastly.com/blog/best-practices-for-using-the-vary-header This change sets `Vary` header always, to be on safer side
* | | | | | | Merge pull request #23125 from Gaurav2728/update_puma_as_webserverRafael França2016-01-194-17/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ci skip] update guide for Puma web server instead of Webrick
| * | | | | | | [ci skip] update guide for Puma web server instead of WebrickGaurav Sharma2016-01-204-17/+14
| | | | | | | | | | | | | | | | | | | | | | | | Rails 5.0 default server puma web server. following commit - https://github.com/rails/rails/commit/ae48ea69
* | | | | | | | Merge pull request #23124 from vipulnsward/rake-railsYves Senn2016-01-193-5/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | - Changed from bin/rake to bin/rails at more application places. [ci skip]
| * | | | | | | | - Changed from bin/rake to bin/rails at more application places.Vipul A M2016-01-203-5/+5
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Only ones left are from the upgrading guide, and command line guide explicit section about rake Follow up of https://github.com/rails/rails/pull/23119 [ci skip]
* | | | | | | | Merge pull request #23123 from schneems/schneems/strong_params_method_missingRichard Schneeman2016-01-192-1/+32
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | [close #23084] Deprecated StrongParameters
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 18:39:33 +0000