aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove json gem dependencyMike Perham2016-02-033-4/+0
| | | All modern Rubies ship JSON as part of stdlib. Using the gem actually hurts multi-platform support due to build difficulties on Windows.
* Merge pull request #23443 from prathamesh-sonpatki/fix-logging-in-developmentMatthew Draper2016-02-041-0/+2
|\ | | | | Put some space for non-assets requests in development mode
| * Put some space for non-assets requests in development modePrathamesh Sonpatki2016-02-031-0/+2
| | | | | | | | - Fixes #23428.
* | Merge pull request #23447 from y-yagi/update_pg_supported_version_in_docsYves Senn2016-02-034-4/+4
|\ \ | | | | | | update supported version of PostgreSQL in docs [ci skip]
| * | update supported version of PostgreSQL in docs [ci skip]yuuji.yaginuma2016-02-034-4/+4
| | | | | | | | | | | | Follow up to #23434
* | | Typos in AR testsAkira Matsuda2016-02-036-10/+10
| | |
* | | Merge pull request #23436 from y-yagi/use_bin_command_in_routes_taskKasper Timm Hansen2016-02-033-17/+17
|\ \ \ | | | | | | | | use rails command in routes task
| * | | use rails command in routes taskyuuji.yaginuma2016-02-033-17/+17
| |/ / | | | | | | | | | | | | For other task has become to use the rails command at doc and test, I think that routes task also it is better to use the rails command.
* | | Merge pull request #20997 from himesh-r/issue-20995Arthur Neves2016-02-022-2/+5
|\ \ \ | |_|/ |/| | | | | | | | Changed id-writer to save join table records based on association primary key #20995.
| * | Changed id-writer to save join table records based on association primary ↵Himesh2016-02-022-2/+5
| | | | | | | | | | | | | | | | | | key #20995 Changed id-writer to save join table records based on association primary key
* | | Sleep well, sweet princeSean Griffin2016-02-021-1/+1
| | | | | | | | | | | | | | | Prototype, you have served us well. But you are no longer how we make an XMLHttpRequest. RIP
* | | Merge pull request #23437 from ryohashimoto/160203_guide_rails_secretJon Moss2016-02-022-2/+2
|\ \ \ | |_|/ |/| | Use rails secret command in guides
| * | use rails secret in rails guidesRyo Hashimoto2016-02-032-2/+2
|/ /
* | Merge pull request #23434 from remomueller/bump-minimum-pg-versionRafael França2016-02-022-3/+8
|\ \ | | | | | | The minimum supported version of PostgreSQL is now >= 9.1
| * | The minimum supported version of PostgreSQL is now >= 9.1Remo Mueller2016-02-022-3/+8
|/ /
* | Merge pull request #23433 from BillyZac/masterArthur Nogueira Neves2016-02-021-2/+2
|\ \ | | | | | | Fix typo.
| * | Fix typo.Zachary Smith2016-02-021-2/+2
| | |
* | | Merge pull request #23429 from qrush/actioncable-doc-updateEileen M. Uchitelle2016-02-024-40/+53
|\ \ \ | |/ / |/| | Several ActionCable doc fixes
| * | [ci skip] Several ActionCable documentation updates:Nick Quaranto2016-02-024-40/+53
|/ / | | | | | | | | | | | | | | * Properly indent code sample in ActionCable::Channel::Streams * Add a doc comment for #stop_all_streams * Reformat + add <tt> blocks around code references in ActionCable::Base docs * Clarify and a little better grammar on ActionCable::RemoteConnections * Correct indentation and clean up ActionCable::Server::Broadcasting code sample
* | Ensure tz aware attributes continue to work with arraysSean Griffin2016-02-021-1/+1
| | | | | | | | There was a typo in the variable name leading to infinite recursion
* | Avoid infinite recursion when bad values are passed to tz aware fieldsSean Griffin2016-02-022-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We had previously updated this to attempt to map over whatever was passed in, so that additional types like range and array could benefit from this behavior without the time zone converter having to deal with every known type. However, the default behavior of a type is to just yield the given value to `map`, which means that if we don't actually know how to handle a value, we'll just recurse infinitely. Since both uses of `map` in this case occur in cases where we know receiving the same object will recurse, we can just break on reference equality. Fixes #23241.
* | Merge pull request #23423 from yui-knk/remove_unnecessary_overrideSean Griffin2016-02-021-12/+0
|\ \ | | | | | | Remove unnecessary overriding of `#initialize`
| * | Remove unnecessary overriding of `#initialize`yui-knk2016-02-021-12/+0
| | | | | | | | | | | | | | | | | | `#initialize` of `HasManyReflection`, `HasOneReflection` and `BelongsToReflection` only pass all arguments to `super` by passed order. These overriding can be removed.
* | | Merge pull request #23426 from RyanNielson/patch-1Kasper Timm Hansen2016-02-021-1/+1
|\ \ \ | |/ / |/| | Change command_task.rb to commands_task.rb in docs
| * | Change command_task.rb to commands_task.rb in docsRyan Nielson2016-02-021-1/+1
|/ / | | | | The initialization documentation references `rails/commands/command_task.rb`. This appears to be a typo as the file is actually `rails/commands/commands_task.rb`.
* | Merge pull request #23331 from amatsuda/valid_scope_nameRafael França2016-02-022-0/+29
|\ \ | | | | | | Warn if a named scope is overwriting an existing scope or method
| * | Suppress :warning:sAkira Matsuda2016-01-281-1/+1
| | |
| * | scope needs the second argumentAkira Matsuda2016-01-281-1/+1
| | |
| * | Revert "Remove valid_scope_name? check - use ruby"Akira Matsuda2016-01-282-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f6db31ec16e42ee7713029f7120f0b011d1ddc6c. Reason: Scope names can very easily conflict, particularly when sharing Concerns within the team, or using multiple gems that extend AR models. It is true that Ruby has the ability to detect this with the -w option, but the reality is that we are depending on too many gems that do not care about Ruby warnings, therefore it might not be a realistic solution to turn this switch on in our real-world apps.
* | | Merge pull request #23420 from y-yagi/move_api_test_to_appropriate_fileRafael França2016-02-022-11/+10
|\ \ \ | | | | | | | | move `test_generator_if_skip_action_cable_is_given_for_an_api_app` to the appropriate file
| * | | move `test_generator_if_skip_action_cable_is_given_for_an_api_app` to the ↵yuuji.yaginuma2016-02-022-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | appropriate file Test of Rails API should be in `api_app_generator_test.rb`.
* | | | Merge pull request #23396 from pschambacher/pschambacher/fix_assert_generatesRafael França2016-02-021-0/+1
|\ \ \ \ | | | | | | | | | | Duplicate assert_generates options before modifying it
| * | | | Duplicate assert_generates options before modifying itPierre Schambacher2016-02-011-0/+1
| | | | |
* | | | | Merge pull request #23414 from maclover7/23411Rafael França2016-02-023-3/+16
|\ \ \ \ \ | | | | | | | | | | | | Fix regression in `Hash#dig` for HashWithIndifferentAccess.
| * | | | | Fix regression in `Hash#dig` for HashWithIndifferentAccess.Jon Moss2016-02-013-3/+16
|/ / / / /
* | / / / Generated engines should protect from forgeryAaron Patterson2016-02-012-3/+4
| |/ / / |/| | | | | | | | | | | | | | | | | | | Generated engines should call `protect_from_forgery`. If this method isn't called, then the Engine could be susceptible to XSS attacks. Thanks @tomekr for reporting this to us!
* | | | :warning: assigned but unused variable - errAkira Matsuda2016-02-021-2/+2
| | | |
* | | | Merge pull request #23408 from kangkyu/patch-1Claudio B2016-02-011-2/+2
|\ \ \ \ | | | | | | | | | | Update CHANGELOG.md
| * | | | Update CHANGELOG.mdKang-Kyu Lee2016-02-011-2/+2
|/ / / / | | | | | | | | fix indentation to show it as code
* | | | Add some Action Cable CHANGELOG entriesRafael Mendonça França2016-02-016-16/+11
| | | | | | | | | | | | | | | | | | | | | | | | And improve changelongs. [ci skip]
* | | | Preparing for Rails 5.0.0.beta2Sean Griffin2016-02-0122-46/+96
| | | |
* | | | Merge pull request #23407 from jeremy/corrupt-before-commitJeremy Daer2016-02-012-2/+33
|\ \ \ \ | | | | | | | | | | Fix corrupt transaction state caused by `before_commit` exceptions
| * | | | Fix corrupt transaction state caused by `before_commit` exceptionsJeremy Daer2016-02-012-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a `before_commit` callback raises, the database is rolled back but AR's record of the current transaction is not, leaving the connection in a perpetually broken state that affects all future users of the connection: subsequent requests, jobs, etc. They'll think a transaction is active when none is, so they won't BEGIN on their own. This manifests as missing `after_commit` callbacks and broken ROLLBACKs. This happens because `before_commit` callbacks fire before the current transaction is popped from the stack, but the exception-handling path they hit assumes that the current transaction was already popped. So the database ROLLBACK is issued, but the transaction stack is left intact. Common cause: deadlocked `#touch`, which is now implemented with `before_commit` callbacks. What's next: * We shouldn't allow active transaction state when checking in or out from the connection pool. Verify that conns are clean. * Closer review of txn manager sad paths. Are we missing other spots where we'd end up with incorrect txn state? What's the worst that can happen if txn state drifts? How can we guarantee it doesn't and contain the fallout if it does? Thanks for @tomafro for expert diagnosis!
* | | | | Add spaces in the braces.Kasper Timm Hansen2016-02-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Solves personal insanity, since I was down in these files. (Please don't submit PRs like this.)
* | | | | Converge on filter.Kasper Timm Hansen2016-02-011-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some places were saying filter, while others said filter_options, spare the ambiguity and use filter throughout. This inlines a needless local variable and clarifies a route filter consists of defaults and values to match against.
* | | | | Simplify filter normalization.Kasper Timm Hansen2016-02-011-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assume the filter is a string, if it wasn't a hash and isn't nil. Remove needless else and rely on Ruby's default nil return. Add spaces within hash braces.
* | | | | Merge pull request #23225 from vipulnsward/20420-rake-routes-optionsKasper Timm Hansen2016-02-017-30/+163
|\ \ \ \ \ | | | | | | | | | | | | Add options for rake routes task
| * | | | | Add options for rake routes taskVipul A M2016-02-027-30/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add two options: `-c` and `-g`. `-g` option returns the urls name, verb and path fields that match the pattern. `-c` option returns the urls for specific controller. Fixes #18902, and Fixes #20420 [Anton Davydov & Vipul A M]
* | | | | | Revert "Merge pull request #16400 from bogdan/last-with-sql"Sean Griffin2016-02-013-60/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9f3730a516f30beb0050caea9539f8d6b808e58a, reversing changes made to 2637fb75d82e1c69333855abd58c2470994995d3. There are additional issues with this commit that need to be addressed before this change is ready (see #23377). This is a temporary revert in order for us to have more time to address the issues with that PR, without blocking the release of beta2.
* | | | | | Merge pull request #23398 from matthewd/interlockMatthew Draper2016-02-024-23/+119
|\ \ \ \ \ \ | | | | | | | | | | | | | | Address remaining known issues in Interlock
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 21:25:36 +0000