aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use released GlobalID now that it provides URI::GID::MissingModelIdError for ...Jeremy Daer2015-12-173-13/+5
* Merge pull request #22639 from arunagw/aa-remove-few-warnings-actioncableGuillermo Iguaran2015-12-177-6/+13
|\
| * Remove warnings from actioncableArun Agrawal2015-12-177-6/+13
* | Merge pull request #22646 from maclover7/masterGuillermo Iguaran2015-12-172-2/+2
|\ \
| * | Require Nokogiri >= 1.6.7.1Jon Moss2015-12-172-2/+2
|/ /
* | Merge pull request #22645 from kaspth/parameters-only-deep-dup-hash-arrayMatthew Draper2015-12-182-2/+46
|\ \
| * | Only dup Ruby's Hash and Array.Kasper Timm Hansen2015-12-172-2/+46
* | | 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
* | | 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 Applic...David Heinemeier Hansson2015-12-1712-45/+25
| * | | 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
|/ /
* | 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 for has_many :through [ci-...Eric Krause2015-12-171-1/+2
* | | 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>`Gaurav Sharma2015-12-181-2/+2
|/ /
* / Call the new point behavior `:point`, not `:rails_5_1_point`Sean Griffin2015-12-173-7/+6
|/
* Merge pull request #22640 from nateberkopec/fix-my-typo-and-clarifyRafael França2015-12-171-8/+9
|\
| * Clarify thread_mattr_accessor subclass behavior documentationNate Berkopec2015-12-171-8/+9
* | Merge pull request #22637 from arunagw/aa-add-actioncable-to-build-stepRafael França2015-12-171-4/+2
|\ \
| * | 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
|/
* Merge pull request #22638 from lpaulmp/patch-1Abdelkader Boudih2015-12-171-1/+1
|\
| * Update USAGEPaul Montero2015-12-171-1/+1
|/
* 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 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]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]Arun Agrawal2015-12-171-1/+1
| |/
* | Merge pull request #22630 from rails/attribute-accessors-per-threadDavid Heinemeier Hansson2015-12-175-0/+302
|\ \ | |/ |/|
| * 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 clas...David Heinemeier Hansson2015-12-175-0/+302
* | Merge pull request #22068 from y-yagi/change_default_to_markdownRafael França2015-12-177-9/+13
|\ \
| * | README.rdoc -> README.md for newly generated pluginsyuuji.yaginuma2015-12-177-9/+13
* | | Merge pull request #22629 from prathamesh-sonpatki/kill-extra-line-in-manifes...Rafael França2015-12-171-1/+0
|\ \ \
| * | | 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]Prathamesh Sonpatki2015-12-171-4/+4
| | |_|/ | |/| |
* | | | Update README.mdXavier Noria2015-12-171-1/+1
* | | | Merge pull request #22621 from akshay-vishnoi/add-missing-testsRichard Schneeman2015-12-171-0/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Add missing test cases for asset_pathAkshay Vishnoi2015-12-171-0/+2