aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #22639 from arunagw/aa-remove-few-warnings-actioncableGuillermo Iguaran2015-12-177-6/+13
|\ | | | | Remove warnings from actioncable test
| * Remove warnings from actioncableArun Agrawal2015-12-177-6/+13
| | | | | | | | Warnings coming from code and test are removed
* | Merge pull request #22646 from maclover7/masterGuillermo Iguaran2015-12-172-2/+2
|\ \ | | | | | | Require Nokogiri >= 1.6.7.1
| * | Require Nokogiri >= 1.6.7.1Jon Moss2015-12-172-2/+2
|/ / | | | | | | Many CVEs released: https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
* | Merge pull request #22645 from kaspth/parameters-only-deep-dup-hash-arrayMatthew Draper2015-12-182-2/+46
|\ \ | | | | | | Only dup Ruby's Hash and Array.
| * | Only dup Ruby's Hash and Array.Kasper Timm Hansen2015-12-172-2/+46
| | | | | | | | | | | | | | | | | | | | | | | | When calling `to_h` on an `ActionController::Parameters` instance it would `deep_dup` its internal parameters. This inadvertently called `dup` on a passed Active Record model which would create new models. Fix by only dupping Ruby's Arrays and Hashes.
* | | Should also stub the received callbackDavid Heinemeier Hansson2015-12-171-0/+3
| | |
* | | Don't log Action Cable to STDOUT in developmenteileencodes2015-12-172-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logging Action Cable to STDOUT caused the development log to see double messages like this: ``` Started GET "/" for ::1 at 2015-12-17 15:21:34 -0500 Started GET "/" for ::1 at 2015-12-17 15:21:34 -0500 Processing by Rails::WelcomeController#index as HTML Processing by Rails::WelcomeController#index as HTML Rendered /welcome/index.html.erb (0.0ms) Rendered /welcome/index.html.erb (0.0ms) Completed 200 OK in 3ms (Views: 1.3ms | ActiveRecord: 0.0ms) Completed 200 OK in 3ms (Views: 1.3ms | ActiveRecord: 0.0ms) ``` Now that Action Cable is part of Rails it doesn't need it's own logger and will log to STDOUT via the local dev server here: https://github.com/rails/rails/blob/master/railties/lib/rails/commands/server.rb
* | | Use release sprockets-railsRafael Mendonça França2015-12-173-17/+7
| | |
* | | Use released jquery-railsRafael Mendonça França2015-12-172-12/+0
| | |
* | | Merge pull request #22627 from rails/application-mailer-by-defaultRafael França2015-12-1713-46/+26
|\ \ \ | | | | | | | | ApplicationMailer should be generated by default just like every other Application* parent
| * | | ApplicationMailer should be generated by default just like every other ↵David Heinemeier Hansson2015-12-1712-45/+25
| | | | | | | | | | | | | | | | Application* parent
| * | | Fix warningRafael Mendonça França2015-12-171-1/+1
| | | |
* | | | Use released arelRafael Mendonça França2015-12-174-12/+3
| |/ / |/| |
* | | [ci skip] Add `Thread.current` to match internalsKasper Timm Hansen2015-12-171-2/+2
|/ / | | | | | | | | | | | | | | We call the thread variable accessors on `Thread.current`, which matches Ruby's documentation: http://ruby-doc.org/core-2.2.0/Thread.html#method-i-thread_variable_get Fix these to stay `current` ( ͡° ͜ʖ ͡°)
* | Use released mail gemRafael Mendonça França2015-12-172-10/+2
| |
* | Merge pull request #22644 from erickrause/expanding_has_many_through_docRafael França2015-12-171-1/+2
|\ \ | | | | | | Expanding the documentation for collection=objects [ci-skip]
| * | Expanding the documentation for collection=objects for has_many :through ↵Eric Krause2015-12-171-1/+2
| | | | | | | | | | | | [ci-skip]
* | | Merge pull request #22643 from Gaurav2728/gaurav-correct_doc_in_action_cableRafael França2015-12-171-2/+2
|\ \ \ | |/ / |/| | traditional make sense with `<tt>ActiveSupport::TaggedLogging</tt>`
| * | traditional make sense with `<tt>ActiveSupport::TaggedLogging</tt>`Gaurav Sharma2015-12-181-2/+2
|/ /
* / Call the new point behavior `:point`, not `:rails_5_1_point`Sean Griffin2015-12-173-7/+6
|/ | | | | Since the attributes API is new in Rails 5, we don't actually need to keep the behavior of `attribute :point`, as it's not a breaking change.
* Merge pull request #22640 from nateberkopec/fix-my-typo-and-clarifyRafael França2015-12-171-8/+9
|\ | | | | Clarify thread_mattr_accessor subclass behavior documentation
| * Clarify thread_mattr_accessor subclass behavior documentationNate Berkopec2015-12-171-8/+9
| | | | | | | | [ci skip]
* | Merge pull request #22637 from arunagw/aa-add-actioncable-to-build-stepRafael França2015-12-171-4/+2
|\ \ | | | | | | Add actioncable to build step for release
| * | Use FRAMEWORKS constant from `tasks/release` to avoid duplicationArun Agrawal2015-12-171-4/+2
| | |
* | | Use released turbolinks in the test suiteRafael Mendonça França2015-12-172-10/+4
| |/ |/|
* | Copy-edit the Per Thread attribute accessor documentationRafael Mendonça França2015-12-171-3/+3
|/ | | | [ci skip]
* Merge pull request #22638 from lpaulmp/patch-1Abdelkader Boudih2015-12-171-1/+1
|\ | | | | Update USAGE [ci skip]
| * Update USAGEPaul Montero2015-12-171-1/+1
|/ | | Fix typo
* Use Thread.current.thread_variable_set/get insetad of the direct accessorsDavid Heinemeier Hansson2015-12-171-4/+4
|
* Merge pull request #22634 from arunagw/api-doc-for-actioncableRafael França2015-12-171-0/+7
|\ | | | | Generate API doc for actioncable
| * Generate API doc for actioncableArun Agrawal2015-12-171-0/+7
| |
* | Merge pull request #22636 from nateberkopec/fix-dhh-typoRafael França2015-12-171-1/+1
|\ \ | | | | | | Fix typo in thread_mattr_accessor doco [ci skip]
| * | Fix typo in thread_mattr_accessor doco [ci skip]Nate Berkopec2015-12-171-1/+1
| | |
* | | Merge pull request #22635 from arunagw/add-actioncable-to-release-listKasper Timm Hansen2015-12-171-1/+1
|\ \ \ | |/ / |/| | Add actioncable to list of release frameworks [ci skip]
| * | Add actioncable to list of release frameworks [ci skip]Arun Agrawal2015-12-171-1/+1
| |/
* | Merge pull request #22630 from rails/attribute-accessors-per-threadDavid Heinemeier Hansson2015-12-175-0/+302
|\ \ | |/ |/| Add thread_m/cattr_accessor/reader/writer suite of methods for declaring class and module variables that live per-thread
| * Use separate test class nameDavid Heinemeier Hansson2015-12-171-1/+1
| |
| * Use consistent referencesDavid Heinemeier Hansson2015-12-171-3/+3
| |
| * Add thread_m/cattr_accessor/reader/writer suite of methods for declaring ↵David Heinemeier Hansson2015-12-175-0/+302
| | | | | | | | class and module variables that live per-thread
* | Merge pull request #22068 from y-yagi/change_default_to_markdownRafael França2015-12-177-9/+13
|\ \ | | | | | | README.rdoc -> README.md for newly generated plugins
| * | README.rdoc -> README.md for newly generated pluginsyuuji.yaginuma2015-12-177-9/+13
| | | | | | | | | | | | I think Markdown is nowadays a better default.
* | | Merge pull request #22629 from ↵Rafael França2015-12-171-1/+0
|\ \ \ | | | | | | | | | | | | | | | | prathamesh-sonpatki/kill-extra-line-in-manifest-js Kill extra newline at the start of generated manifest.js
| * | | Kill extra newline at the start of generated manifest.jsPrathamesh Sonpatki2015-12-171-1/+0
| | | |
* | | | Merge pull request #22632 from prathamesh-sonpatki/fix-upgrading-guideRafael França2015-12-171-4/+4
|\ \ \ \ | | | | | | | | | | Fix section about ApplicationRecord in upgrading guide [ci skip]
| * | | | Fix section about ApplicationRecord in upgrading guide [ci skip]Prathamesh Sonpatki2015-12-171-4/+4
| | |_|/ | |/| |
* | | | Update README.mdXavier Noria2015-12-171-1/+1
| | | | | | | | | | | | ActiveRecord -> Active Record [ci skip]
* | | | Merge pull request #22621 from akshay-vishnoi/add-missing-testsRichard Schneeman2015-12-171-0/+2
|\ \ \ \ | |/ / / |/| | | Add missing test cases for asset_path
| * | | Add missing test cases for asset_pathAkshay Vishnoi2015-12-171-0/+2
| | | |
* | | | Puma 2.15.3 actually works fineDavid Heinemeier Hansson2015-12-171-1/+1
| |_|/ |/| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 21:37:49 +0000