aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #18197 from vipulnsward/fix-ar-2-2warningGuillermo Iguaran2014-12-261-2/+2
|\ | | | | Fixed AR warning on ruby 2.2
| * - Changed `target` to `target_reflection` to avoid warning `possible ↵Vipul A M2014-12-251-2/+2
| | | | | | | | reference to past scope`
* | Merge pull request #18203 from kyledecot/ruby-2.2Guillermo Iguaran2014-12-261-1/+1
|\ \ | | | | | | Targeting 2.2
| * | targeting 2.2Kyle Decot2014-12-251-1/+1
| | |
* | | Merge pull request #18204 from chocoby/remove-double-spaceGuillermo Iguaran2014-12-261-1/+1
|\ \ \ | | | | | | | | Remove unnecessary double space
| * | | Remove unnecessary double spaceKenta Okamoto2014-12-261-1/+1
| |/ /
* | | Merge pull request #18194 from claudiob/remove-action-controller-model-namingGuillermo Iguaran2014-12-252-16/+0
|\ \ \ | |/ / |/| | Remove ActionController::ModelNaming
| * | Remove ActionController::ModelNamingclaudiob2014-12-252-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The methods in these modules are not used anywhere. They used to be invoked in polymorphic_routes.rb but their usage was removed in e821045. What is your opinion about removing these methods? They do belong to the public API, but in reality their code has already been duplicated to ActionView::ModelNaming, since they are used by methods like `dom_id` and `dom_class` to associated records with DOM elements (in ActionView). Please tell me if you think that removing this module is a good idea and, in that case, if the PR is okay as it is, or you'd rather start by showing a deprecation message, and remove the module in Rails 5.1.
* | | Add example to get Errored test to pass in Testing guide [ci skip]Zachary Scott2014-12-251-0/+13
| |/ |/|
* | Merge pull request #18196 from PavelPenkov/rails_env_instead_of_railsMatthew Draper2014-12-261-1/+1
|\ \ | |/ |/| Check for Rails.env instead of Rails
| * Check for Rails.env instead of RailsPavel Penkov2014-12-251-1/+1
|/ | | | | `Rails` constant is added by rails-html-sanitizer leading to bugs in non-Rails apps using ActiveRecord and ActionMailer
* Merge pull request #18185 from ivalkeen/add_missing_guidesZachary Scott2014-12-241-0/+5
|\ | | | | List the Active Support Instrumentation guide in the index (as WIP)
| * List the Active Support Instrumentation guide in the index (as WIP)Ivan Tkalin2014-12-241-0/+5
| |
* | Correct grammar to fix #18182 [ci skip]Zachary Scott2014-12-241-1/+1
| |
* | Merge pull request #18190 from ef718/masterZachary Scott2014-12-241-1/+1
|\ \ | | | | | | Fix grammar in Caching with Rails docs
| * | Update grammar [ci skip]Elaine Fang2014-12-241-1/+1
| |/
* / Fix a few typos [ci skip]Robin Dupret2014-12-242-5/+6
|/
* Merge pull request #18183 from danbernier/masterArun Agrawal2014-12-241-1/+1
|\ | | | | Fix bug in ActionMailer guide.
| * Fix bug in ActionMailer guide.Dan Bernier2014-12-241-1/+1
|/ | | | | When setting a mailer's default from address, you have to pass a hash with a `:from` key; you can't pass just an email address.
* Merge pull request #18107 from mkdynamic/add-reply-to-mail-toSean Griffin2014-12-242-4/+5
|\ | | | | Add support for Reply-To field in mail_to helper
| * Add support for Reply-To field in mail_to helperMark Dodwell2014-12-202-4/+5
| |
* | Merge pull request #18180 from vipulnsward/remove-unnecessary-name-passingSean Griffin2014-12-241-4/+4
|\ \ | | | | | | Removed unused parameter to cookie serialize method
| * | - Removed unused parameter to cookie serialize method and fixed usage of the ↵Vipul A M2014-12-241-4/+4
|/ / | | | | | | same elsewhere
* | Merge pull request #18159 from ↵Sean Griffin2014-12-231-1/+1
|\ \ | | | | | | | | | | | | M7/docs-active_record-update_query_method_docs_with_full_description Describe full behaviour of Active Record's attribute query methods
| * | Clarify that query methods have a custom definition of whether a numeric ↵Michael D.W. Prendergast2014-12-231-2/+2
| | | | | | | | | | | | | | | value is present. [ci skip] The way Active Record query methods handle numeric values is a special case, and is not part of Rails's standard definition of present. This update attempts to make this more clear in the docs, so that people don't expect Object#present? to return false if used on a number that is zero.
| * | Clarify that the word present refers to Object#present?. [ci skip]Michael D.W. Prendergast2014-12-231-36/+2
| | | | | | | | | Update Active Record's attribute query methods documentation to clarify that whether an attribute is present is based on Object#present?. This gives people a place to go see what the exact definition of presence is. [ci skip]
| * | Update Active Record's attribute query methods documentation to describe its ↵Michael D.W. Prendergast2014-12-221-2/+36
| | | | | | | | | | | | full behaviour. [ci skip]
* | | removes superfluous regexp groupXavier Noria2014-12-231-1/+1
| | |
* | | warn about reading guides in GitHubXavier Noria2014-12-2348-0/+96
| | | | | | | | | | | | References #18148.
* | | third test to warn against reading guides in GitHubXavier Noria2014-12-232-2/+2
| | |
* | | second test to warn against reading guides in GitHubXavier Noria2014-12-232-3/+2
| | |
* | | proof of concept, need to check in GitHubXavier Noria2014-12-232-0/+4
| | |
* | | Merge pull request #18174 from bogdan/cleanup_has_many_though_association_countSean Griffin2014-12-231-15/+0
|\ \ \ | | | | | | | | Remove unneeded special case to calculate size for has_many :through
| * | | Remove unneeded special case to calculate size for has_many :throughBogdan Gusiev2014-12-231-15/+0
| | | | | | | | | | | | | | | | | | | | All cases are properly handled in CollectionAssociation for all subclasses of this association
* | | | Merge pull request #18170 from tgxworld/add_docs_for_rails_application_secretsSean Griffin2014-12-231-1/+15
|\ \ \ \ | | | | | | | | | | | | | | | [ci skip]
| * | | | Rails::Application#secrets should be documented.Guo Xiang Tan2014-12-241-1/+15
| | | | |
* | | | | Don't treat `nil` as changed in serialized typesSean Griffin2014-12-232-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were ignoring the `default_value?` escape clause in the serialized type, which caused the default value to always be treated as changed. Fixes #18169
* | | | | Refactor a common class to reduce the duplication for `references`Sean Griffin2014-12-232-59/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code for `TableDefinition#references` and `SchemaStatements#add_reference` were almost identical both structurally, and in terms of domain knowledge. This removes that duplication into a common class, using the `Table` API as the expected interface of its collaborator.
* | | | | Fix syntax warningSean Griffin2014-12-231-1/+1
| | | | | | | | | | | | | | | | | | | | This isn't Seattle.rb, @senny. ;)
* | | | | Merge pull request #18167 from al2o3cr/checkin_connection_leakSean Griffin2014-12-232-4/+36
|\ \ \ \ \ | | | | | | | | | | | | Fix connection leak when a thread checks in additional connections.
| * | | | | Fix connection leak when a thread checks in additional connections.Matt Jones2014-12-232-4/+36
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code in `ConnectionPool#release` assumed that a single thread only ever holds a single connection, and thus that releasing a connection only requires the owning thread_id. There is a trivial counterexample to this assumption: code that checks out additional connections from the pool in the same thread. For instance: connection_1 = ActiveRecord::Base.connection connection_2 = ActiveRecord::Base.connection_pool.checkout ActiveRecord::Base.connection_pool.checkin(connection_2) connection_3 = ActiveRecord::Base.connection At this point, connection_1 has been removed from the `@reserved_connections` hash, causing a NEW connection to be returned as connection_3 and the loss of any tracking info on connection_1. As long as the thread in this example lives, connection_1 will be inaccessible and un-reapable. If this block of code runs more times than the size of the connection pool in a single thread, every subsequent connection attempt will timeout, as all of the available connections have been leaked. Reverts parts of 9e457a8654fa89fe329719f88ae3679aefb21e56 and essentially all of 4367d2f05cbeda855820e25a08353d4b7b3457ac
* | | | | Merge pull request #18166 from merongivian/search_field_refactorSean Griffin2014-12-232-10/+12
|\ \ \ \ \ | | | | | | | | | | | | Remove block from super
| * | | | | Remove block from superJose Añasco2014-12-232-10/+12
| | | | | |
* | | | | | Changelog for 99a6f9e60ea55924b44f894a16f8de0162cf2702Sean Griffin2014-12-231-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Here you go, @senny. :grin:
* | | | | | Merge pull request #18145 from georgemillo/patch-2Sean Griffin2014-12-231-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add information about "allow_destroy" requiring an ID. [ci skip]
| * | | | | | Add information about "allow_destroy" requiring an ID. [ci skip]George Millo2014-12-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I just wasted an absurd amount of time trying to figure out why my model wasn't being deleted even though I was setting `_destroy` to true like the instructions said. Making the documentation a little bit clear so that someone like me doesn't waste their time in future.
* | | | | | | Merge Pull Request #18157Sean Griffin2014-12-233-1/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG.md
| * | | | | | | Don't raise on out-of-range datetimes passed by a userGrey Baker2014-12-233-1/+20
| | |_|/ / / / | |/| | | | |
* | | | | | | docs, replace ` with + for proper rdoc output. [ci skip]Yves Senn2014-12-232-4/+4
| | | | | | |
* | | | | | | Replace deprecated `#load_schema` with `#load_schema_for`.Yves Senn2014-12-233-24/+26
| | | | | | |