Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add No Doc | Cory Gwin | 2015-12-18 | 2 | -1/+1 |
| | | | | In reference to rails/rail#22403 add a :nodoc: | ||||
* | Merge pull request #22642 from seuros/remove-mysql-adapter | Matthew Draper | 2015-12-18 | 55 | -1732/+64 |
|\ | | | | | | | Remove legacy mysql adapter | ||||
| * | Remove legacy mysql adapter | Abdelkader Boudih | 2015-12-17 | 54 | -1732/+59 |
| | | |||||
* | | Use released GlobalID now that it provides URI::GID::MissingModelIdError for ↵ | Jeremy Daer | 2015-12-17 | 3 | -13/+5 |
| | | | | | | | | Active Job | ||||
* | | Merge pull request #22639 from arunagw/aa-remove-few-warnings-actioncable | Guillermo Iguaran | 2015-12-17 | 7 | -6/+13 |
|\ \ | | | | | | | Remove warnings from actioncable test | ||||
| * | | Remove warnings from actioncable | Arun Agrawal | 2015-12-17 | 7 | -6/+13 |
| |/ | | | | | | | Warnings coming from code and test are removed | ||||
* | | Merge pull request #22646 from maclover7/master | Guillermo Iguaran | 2015-12-17 | 2 | -2/+2 |
|\ \ | | | | | | | Require Nokogiri >= 1.6.7.1 | ||||
| * | | Require Nokogiri >= 1.6.7.1 | Jon Moss | 2015-12-17 | 2 | -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-array | Matthew Draper | 2015-12-18 | 2 | -2/+46 |
|\ \ | | | | | | | Only dup Ruby's Hash and Array. | ||||
| * | | Only dup Ruby's Hash and Array. | Kasper Timm Hansen | 2015-12-17 | 2 | -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 callback | David Heinemeier Hansson | 2015-12-17 | 1 | -0/+3 |
| | | | |||||
* | | | Don't log Action Cable to STDOUT in development | eileencodes | 2015-12-17 | 2 | -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-rails | Rafael Mendonça França | 2015-12-17 | 3 | -17/+7 |
| | | | |||||
* | | | Use released jquery-rails | Rafael Mendonça França | 2015-12-17 | 2 | -12/+0 |
| | | | |||||
* | | | Merge pull request #22627 from rails/application-mailer-by-default | Rafael França | 2015-12-17 | 13 | -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 Hansson | 2015-12-17 | 12 | -45/+25 |
| | | | | | | | | | | | | | | | | Application* parent | ||||
| * | | | Fix warning | Rafael Mendonça França | 2015-12-17 | 1 | -1/+1 |
| | | | | |||||
* | | | | Use released arel | Rafael Mendonça França | 2015-12-17 | 4 | -12/+3 |
| |/ / |/| | | |||||
* | | | [ci skip] Add `Thread.current` to match internals | Kasper Timm Hansen | 2015-12-17 | 1 | -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 gem | Rafael Mendonça França | 2015-12-17 | 2 | -10/+2 |
| | | |||||
* | | Merge pull request #22644 from erickrause/expanding_has_many_through_doc | Rafael França | 2015-12-17 | 1 | -1/+2 |
|\ \ | | | | | | | Expanding the documentation for collection=objects [ci-skip] | ||||
| * | | Expanding the documentation for collection=objects for has_many :through ↵ | Eric Krause | 2015-12-17 | 1 | -1/+2 |
| | | | | | | | | | | | | [ci-skip] | ||||
* | | | Merge pull request #22643 from Gaurav2728/gaurav-correct_doc_in_action_cable | Rafael França | 2015-12-17 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | traditional make sense with `<tt>ActiveSupport::TaggedLogging</tt>` | ||||
| * | | traditional make sense with `<tt>ActiveSupport::TaggedLogging</tt>` | Gaurav Sharma | 2015-12-18 | 1 | -2/+2 |
|/ / | |||||
* / | Call the new point behavior `:point`, not `:rails_5_1_point` | Sean Griffin | 2015-12-17 | 3 | -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-clarify | Rafael França | 2015-12-17 | 1 | -8/+9 |
|\ | | | | | Clarify thread_mattr_accessor subclass behavior documentation | ||||
| * | Clarify thread_mattr_accessor subclass behavior documentation | Nate Berkopec | 2015-12-17 | 1 | -8/+9 |
| | | | | | | | | [ci skip] | ||||
* | | Merge pull request #22637 from arunagw/aa-add-actioncable-to-build-step | Rafael França | 2015-12-17 | 1 | -4/+2 |
|\ \ | | | | | | | Add actioncable to build step for release | ||||
| * | | Use FRAMEWORKS constant from `tasks/release` to avoid duplication | Arun Agrawal | 2015-12-17 | 1 | -4/+2 |
| | | | |||||
* | | | Use released turbolinks in the test suite | Rafael Mendonça França | 2015-12-17 | 2 | -10/+4 |
| |/ |/| | |||||
* | | Copy-edit the Per Thread attribute accessor documentation | Rafael Mendonça França | 2015-12-17 | 1 | -3/+3 |
|/ | | | | [ci skip] | ||||
* | Merge pull request #22638 from lpaulmp/patch-1 | Abdelkader Boudih | 2015-12-17 | 1 | -1/+1 |
|\ | | | | | Update USAGE [ci skip] | ||||
| * | Update USAGE | Paul Montero | 2015-12-17 | 1 | -1/+1 |
|/ | | | Fix typo | ||||
* | Use Thread.current.thread_variable_set/get insetad of the direct accessors | David Heinemeier Hansson | 2015-12-17 | 1 | -4/+4 |
| | |||||
* | Merge pull request #22634 from arunagw/api-doc-for-actioncable | Rafael França | 2015-12-17 | 1 | -0/+7 |
|\ | | | | | Generate API doc for actioncable | ||||
| * | Generate API doc for actioncable | Arun Agrawal | 2015-12-17 | 1 | -0/+7 |
| | | |||||
* | | Merge pull request #22636 from nateberkopec/fix-dhh-typo | Rafael França | 2015-12-17 | 1 | -1/+1 |
|\ \ | | | | | | | Fix typo in thread_mattr_accessor doco [ci skip] | ||||
| * | | Fix typo in thread_mattr_accessor doco [ci skip] | Nate Berkopec | 2015-12-17 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #22635 from arunagw/add-actioncable-to-release-list | Kasper Timm Hansen | 2015-12-17 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Add actioncable to list of release frameworks [ci skip] | ||||
| * | | Add actioncable to list of release frameworks [ci skip] | Arun Agrawal | 2015-12-17 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #22630 from rails/attribute-accessors-per-thread | David Heinemeier Hansson | 2015-12-17 | 5 | -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 name | David Heinemeier Hansson | 2015-12-17 | 1 | -1/+1 |
| | | |||||
| * | Use consistent references | David Heinemeier Hansson | 2015-12-17 | 1 | -3/+3 |
| | | |||||
| * | Add thread_m/cattr_accessor/reader/writer suite of methods for declaring ↵ | David Heinemeier Hansson | 2015-12-17 | 5 | -0/+302 |
| | | | | | | | | class and module variables that live per-thread | ||||
* | | Merge pull request #22068 from y-yagi/change_default_to_markdown | Rafael França | 2015-12-17 | 7 | -9/+13 |
|\ \ | | | | | | | README.rdoc -> README.md for newly generated plugins | ||||
| * | | README.rdoc -> README.md for newly generated plugins | yuuji.yaginuma | 2015-12-17 | 7 | -9/+13 |
| | | | | | | | | | | | | I think Markdown is nowadays a better default. | ||||
* | | | Merge pull request #22629 from ↵ | Rafael França | 2015-12-17 | 1 | -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.js | Prathamesh Sonpatki | 2015-12-17 | 1 | -1/+0 |
| | | | | |||||
* | | | | Merge pull request #22632 from prathamesh-sonpatki/fix-upgrading-guide | Rafael França | 2015-12-17 | 1 | -4/+4 |
|\ \ \ \ | | | | | | | | | | | Fix section about ApplicationRecord in upgrading guide [ci skip] | ||||
| * | | | | Fix section about ApplicationRecord in upgrading guide [ci skip] | Prathamesh Sonpatki | 2015-12-17 | 1 | -4/+4 |
| | |_|/ | |/| | |