aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #23459 from mperham/masterArthur Nogueira Neves2016-02-032-2/+0
|\ | | | | Remove unused dependency
| * Remove unused dependencyMike Perham2016-02-032-2/+0
| | | | | | railties uses method_source, activesupport does not. I assume code was refactored and the dependency wasn't removed.
* | Merge pull request #23457 from matthewd/arel-attributeMatthew Draper2016-02-0412-31/+38
|\ \ | |/ |/| Defer Arel attribute lookup to the model class
| * Extract a Relation#arel_attributeMatthew Draper2016-02-047-16/+20
| |
| * Defer Arel attribute lookup to the model classMatthew Draper2016-02-0412-31/+34
| | | | | | | | | | This still isn't as separated as I'd like, but it at least moves most of the burden of alias mapping in one place.
* | Merge pull request #23456 from kaspth/line-filter-triggers-one-runnableKasper Timm Hansen2016-02-032-2/+26
|\ \ | | | | | | Fix line filters running tests from multiple runnables.
| * | Fix model test path typo uncovered in previous commit.Kasper Timm Hansen2016-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because of the expanding whitelist for test filters, this test ended up running the tests on lines 4 and 9 in the post test even though the path wasn't right. Happened incidentally because the same line numbers were used in both account and post test. Add the .rb line so the file is required correctly and the filters are applied.
| * | Fix line filters running tests from multiple runnables.Kasper Timm Hansen2016-02-032-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `derive_regexp` was written with the assumption that we were run from a blank slate — that if the filter didn't match we might as well return it because it was nil. This isn't the case because minitest calls `run` on every runnable. Which is any subclass of Minitest::Runnable, such as ActiveSupport::TestCase, ActionDispatch::IntegrationTest as well as any inheriting from those. Thus after the first `run` we'd have put in a composite filter in `options[:filter]` making the next `run` create a linked list when it failed to match the regexp and put the composite filter as the head. Every runnable would accumulate more and more of the same filters, which effectively acted like an expanding whitelist and we ran tests from other runnables. Clog the accumulation by returning nil if there's no filter to derive a regexp from. Note: we pass a seed in the tests because Minitest shuffles the runnables to ensure the whitelist is expanded enough that the failure is triggered.
* | | Merge pull request #23455 from alexeyzab/add_apple_dummy_icon_filesRafael França2016-02-033-0/+4
|\ \ \ | |/ / |/| | Add dummy apple icon files
| * | Add dummy apple icon filesAlexey Zabelin2016-02-033-0/+4
|/ / | | | | | | | | | | | | | | Previously Safari would try to load these files when you visit localhost:3000. That created two exceptions in the log. It also caused the exception notifier to send them out. In response to #23427
* | Merge pull request #23442 from ↵Rafael França2016-02-032-1/+4
|\ \ | | | | | | | | | | | | prathamesh-sonpatki/improve-pg-version-old-error-message Improve pg version old error message and mention this change in release notes.
| * | Mention PostgreSQL version support in release notes [ci skip]Prathamesh Sonpatki2016-02-031-0/+3
| | |
| * | Mention supported PG version in the error message.Prathamesh Sonpatki2016-02-031-1/+1
| | |
* | | Merge pull request #23453 from mperham/remove_jsonRafael França2016-02-033-4/+0
|\ \ \ | | | | | | | | Remove json gem dependency
| * | | 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!
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 08:02:23 +0000