aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | 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
| * | | | | | | Link to docs instead of listing methodsschneems2016-01-191-5/+7
| | | | | | | |
| * | | | | | | Add methods to StrongParametersschneems2016-01-192-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | It's reasonable to expose different value readers.
| * | | | | | | [close #23084] Deprecated StrongParametersschneems2016-01-192-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can provide a more flexible upgrade experience by warning users they are using unsafe methods instead of forcing the safe API by deprecating before removal. This PR provides this functionality.
* | | | | | | | Merge pull request #23119 from Gaurav2728/update_guide_to_bin_rails_commandJon Moss2016-01-196-37/+37
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | use bin/rails default instead of rake commands [ci skip]
| * | | | | | | use bin/rails default instead of rake commands [ci skip]Gaurav Sharma2016-01-196-37/+37
|/ / / / / / / | | | | | | | | | | | | | | I go through the `http://edgeguides.rubyonrails.org/` and found `rake` commands in various files that are in RAILS 5.0 implement by `bin/rails` command. I try to change all that can be directly use `bin/rails …`
* | | | | | | Merge pull request #23122 from vipulnsward/guides-revampDavid Heinemeier Hansson2016-01-192-14/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Guides header changes
| * | | | | | | - Remove dead links and take users to just the home page insteadVipul A M2016-01-192-14/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add new logo for guides header [ci skip]
* | | | | | | Merge pull request #23121 from prathamesh-sonpatki/fix-testsYves Senn2016-01-191-4/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Fix test failure on PostgreSQL by sorting the result before comparison
| * | | | | | Fix test failure on PostgreSQL by sorting the result before comparisonPrathamesh Sonpatki2016-01-191-4/+5
|/ / / / / /
* | | | | | run `type` column through attribtues API type casting.Yves Senn2016-01-193-0/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #21986. This makes it possible to write custom types that define a different mapping for STI columns.
* | | | | | Merge pull request #23117 from vipulnsward/22297-ar-exception-raiseAbdelkader Boudih2016-01-191-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Mention that halting chain does not re-raise `ActiveRecord::RecordIn…
| * | | | | | Mention that halting chain does not re-raise `ActiveRecord::RecordInvalid` ↵Vipul A M2016-01-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exception as well, similar to `ActiveRecord::Rollback` Fixes #22297 [ci skip]
* | | | | | | Merge pull request #23116 from vipulnsward/22648-html-safe-textप्रथमेश Sonpatki2016-01-191-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Make text about render :html option clearer to state, text will get e…
| * | | | | | | Make text about render :html option clearer to state, text will get escaped ↵Vipul A M2016-01-191-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if not marked as safe by using html_safe Fixes #22648 [ci skip]
* | | | | | | Merge pull request #23114 from ↵Kasper Timm Hansen2016-01-191-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | y-yagi/refer_to_rails_command_instead_of_rake_in_environment_error refer to rails command instead of rake in environment error
| * | | | | | refer to rails command instead of rake in environment erroryuuji.yaginuma2016-01-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It has been to use an overall rails command in ea4f0e2baba8653b03fba154357842933cf7b778, in order to unify.
* | | | | | | Merge pull request #23112 from prathamesh-sonpatki/association-guides-fixesKasper Timm Hansen2016-01-191-6/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix discrepancies in associations guide [ci skip]
| * | | | | | | Fix discrepancies in associations guide [ci skip]Prathamesh Sonpatki2016-01-191-6/+6
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | - Followup of https://github.com/rails/rails/commit/71ff088a09d429657877ddfb58985d30df63fc8a
* | | | | | | Merge pull request #23110 from amitsuroliya/application_recordप्रथमेश Sonpatki2016-01-191-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | `ApplicationRecord` instead of `ActiveRecord::Base` in Association G…
| * | | | | | `ApplicationRecord` instead of `ActiveRecord::Base` in Association Guides ↵amitkumarsuroliya2016-01-191-2/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | [ci skip]