aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Allow `send_file` to declare a charsetJon Moss2016-08-292-4/+6
| | | | | | Removed my patch in favor of @tenderlove's less invasive approach. [Aaron Patterson & Jon Moss]
* Remove unneeded FIXME noteRafael Mendonça França2016-08-291-2/+0
| | | | | This is the intended behavior. You should not do more than one request in a controller test.
* Merge pull request #26311 from y-yagi/use_inspect_for_show_valueKasper Timm Hansen2016-08-292-1/+10
|\ | | | | use `inspect` for show `from` value
| * use `inspect` for show `from` valueyuuji.yaginuma2016-08-292-1/+10
| | | | | | | | If `from` is nil, in order to avoid the blank is showed.
* | Merge pull request #26310 from kjellberg/guidesJon Moss2016-08-281-0/+1
|\ \ | |/ |/| Add .gitignore to "files & purpose" list - getting started docs
| * Added gitignore to "files & purpose" list [ci skip]Rasmus Kjellberg2016-08-291-0/+1
|/
* Merge pull request #26305 from kamipo/follow-up-to-26301Kasper Timm Hansen2016-08-281-3/+1
|\ | | | | Switch back to `Hash.dup`
| * Switch back to `Hash.dup`Ryuta Kamizono2016-08-281-3/+1
| | | | | | | | Follow up to #26301.
* | Merge pull request #26306 from kamipo/remove_under_ruby-1.9Kasper Timm Hansen2016-08-281-9/+9
|\ \ | |/ |/| Remove "Under Ruby 1.9" [ci skip]
| * Remove "Under Ruby 1.9" [ci skip]Ryuta Kamizono2016-08-281-9/+9
|/ | | | Rails dropped Ruby 1.9 support, but this comment still true.
* validate_each in NumericalityValidator is never called in this case.Guillermo Iguaran2016-08-281-2/+0
| | | | | NumericalityValidator#validate_each is never called when allow_nil is true and the value is nil because it is already skipped in EachValidator#validate.
* Add test for allow_blank in numericality validationNicolai Reuschling2016-08-281-0/+7
| | | | Signed-off-by: Guillermo Iguaran <guilleiguaran@gmail.com>
* Merge pull request #26301 from maclover7/jm-fix-commentGuillermo Iguaran2016-08-271-4/+2
|\ | | | | Switch back to `Hash.dup`
| * Switch back to `Hash.dup`Jon Moss2016-08-271-4/+2
|/ | | | | | | | | | | | | The performance difference between `Hash[]` and `Hash.dup` looks to have been narrowed by @tenderlove via this commit --> https://github.com/ruby/ruby/commit/b3803cc49ad382e23291d75ce57ffb2b74bb9577#diff-eff9999082c8ce7d8ba1fc1d79f439cf. Since this commit first appeared in Ruby 2.0.0, and since Rails now requires a minimum Ruby version of 2.2.2, this performance boost should be available for all users. Relevant links: - This behavior was originally added via https://github.com/rails/rails/commit/02174a3efc6fa8f2e5e6f114e4cf0d8a06305b6a - The conversation on the Ruby issue tracker lives here --> https://bugs.ruby-lang.org/issues/7166
* Merge pull request #26299 from davydovanton/fix-typoVipul A M2016-08-271-1/+1
|\ | | | | Fix typo in Delegation#delegate_missing_to doc [ci skip]
| * Fix typo in Delegation#delegate_missing_to doc [skip ci]Anton Davydov2016-08-271-1/+1
|/
* Merge pull request #26297 from ledermann/patch-1Vijay Dev2016-08-271-1/+1
|\ | | | | Errors#add_on_blank: Fix typo in deprecation message
| * Fix typo in deprecation messageGeorg Ledermann2016-08-271-1/+1
|/ | | This fixes a copy-and-paste-issue slipped in by #18996
* Merge pull request #26293 from mechanicles/move-custom-assertionGuillermo Iguaran2016-08-272-11/+11
|\ | | | | Move Rails' custom assertion method `assert_nothing_raised` to its proper place.
| * Move custom assertion to its proper placeSantosh Wadghule2016-08-272-11/+11
|/ | | | | | | | ActiveSupport::Testing::Assertions. We have a separate module in which have defined Rails' own custom assertions. So it would be good to keep all custom Rails' assertions in one place i.e. in this module.
* Missing key should throw KeyErroreileencodes2016-08-262-1/+7
| | | | | | It should not throw a NameError, but should throw a KeyError. Fixes #26278
* Merge pull request #26288 from maclover7/jm-revert-21995Guillermo Iguaran2016-08-261-7/+11
|\ | | | | Update `Rails.configuration` documentation
| * Clarify two ways to set Rails configuration optionsJon Moss2016-08-261-5/+8
| | | | | | | | [ci skip]
| * Add back in `config_for` exampleJon Moss2016-08-261-0/+28
| | | | | | | | [ci skip]
| * Revert "Merge pull request #21995 from tak1n/master"Jon Moss2016-08-261-35/+8
| | | | | | | | | | This reverts commit 4973704bf56dbb0d8beba977e1053d57e346ebd0, reversing changes made to 78edeb33346e13ab33a62d2a6b553aabf5b3186a.
* | Merge pull request #26287 from mechanicles/rails-assertionJon Moss2016-08-261-1/+1
|\ \ | |/ |/| Move `assert_nothing_raised` method to Rails Specific Assertions section [ci skip]
| * Move `assert_nothing_raised` method to Rails Specific AssertionsSantosh Wadghule2016-08-261-1/+1
|/ | | | | | | | section [ci skip] - Method `assert_nothing_raised` is Rails' own custom assertion method and not a part of Minitest. So move it from Minitest assertions section to Rails Specific Assertions section.
* Merge pull request #26284 from kamipo/fix_warnigGuillermo Iguaran2016-08-251-1/+1
|\ | | | | Fix "warning: assigned but unused variable - task"
| * Fix "warning: assigned but unused variable - task"Ryuta Kamizono2016-08-261-1/+1
|/
* Fix typo in the hook nameRafael Mendonça França2016-08-251-1/+1
|
* Add load hooks to all tests classesRafael Mendonça França2016-08-254-0/+5
| | | | | | | | | | | | | | | | | | | | | | | Usually users extends tests classes doing something like: ActionView::TestCase.include MyCustomTestHelpers This is bad because it will load the ActionView::TestCase right aways and this will load ActionController::Base making its on_load hooks to execute early than it should. One way to fix this is using the on_load hooks of the components like: ActiveSupport.on_load(:action_view) do ActionView::TestCase.include MyCustomTestHelpers end The problem with this approach is that the test extension will be only load when ActionView::Base is loaded and this may happen too late in the test. To fix this we are adding hooks to people extend the test classes that will be loaded exactly when the test classes are needed.
* kick different instrumentation methodAaron Patterson2016-08-241-8/+12
| | | | | | | We can eliminate a conditional by calling a different instrumentation method depending on the situation. In this case, we'll call the special case "!render_template" instrumentation method and eliminate the case / when clause from the `instrument` method.
* remove useless freezeAaron Patterson2016-08-241-1/+1
| | | | Ruby already does this freeze for us.
* Simplify cache hit loggingAaron Patterson2016-08-242-5/+5
| | | | | | | CacheHelper is mixed in to Helpers, Helpers is mixed in to AV::Base. This means we can count on instances of AV::Base to have the "cache hit" method on them, and we can stop setting an ivar for cache logging and just ask the view if it was a cache hit.
* Merge pull request #26271 from jcoleman/fix-unnecessary-query-cache-busting-testGuillermo Iguaran2016-08-241-0/+20
|\ | | | | Test that AR query cache isn't busted when types are not same object
| * Test that AR query cache isn't busted when types are not same objectJames Coleman2016-08-241-0/+20
| | | | | | | | | | | | | | | | | | | | This is fixed in 5.0 as an ancillary part of 574f255629a45cd67babcfb9bb8e163e091a53b8 but here I also add a test for the condition. I'd previously backported the fix (and added a test) in the below commit; this brings the fix back up to master. (cherry picked from commit fce3dbf30241f2a65c777e192a7171b0eea81453)
* | Merge pull request #26235 from ↵Sean Griffin2016-08-242-1/+23
|\ \ | |/ |/| | | | | samphippen/allow-early-setting-of-integration-session Allow the `integration_sesion` to be set early on ActionDispatch::Integration::Runner.
| * Move setting of integration session to constructor.Sam Phippen2016-08-211-1/+5
| | | | | | | | This allows us to not `||=` in `before_setup`.
| * Allow the `integration_sesion` to be set early on ↵Sam Phippen2016-08-202-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionDispatch::Integration::Runner. In commit fa63448420d3385dbd043aca22dba973b45b8bb2, @tenderlove changed the behaviour of the way `integration_session` is set up in this object. It used to be the case that the first time it was accessed, it was memoized with nil, however, this means that if it had already been set it was not replaced. After that commit, it is now always set to `nil` in the execution of `before_setup`. In RSpec, users are able to invoke `host!` in `before(:all)` blocks, which execute well before `before_setup` is ever invoked (which happens in what is equivalent to a `before(:each)` block, for each test. `host!` causes the integration session to be set up to correctly change the host, but after fa63448420d3385dbd043aca22dba973b45b8bb2 the `integration_session` gets overwritten, meaning that users lose their `host!` configuration (see https://github.com/rspec/rspec-rails/issues/1662). This commit changes the behaviour back to memoizing with `nil`, as opposed to directly overwriting with `nil`. This causes the correct behaviour to occur in RSpec, and unless I'm mistaken will also ensure that users who want to modify their integration sessions early in rails will also be able to do so.
* | Merge pull request #26267 from riseshia/patch-1Rafael França2016-08-231-2/+2
|\ \ | | | | | | Rename the title of comand_line.md in index
| * | Rename the title of comand_line.md in indexShia2016-08-241-2/+2
| | | | | | | | | | | | Remove 'rake tasks' from index
* | | Merge pull request #26182 from bogdan/remove-relation-metaprogrammingRafael França2016-08-234-94/+59
|\ \ \ | |/ / |/| | Remove over meta programming in AR::Relation
| * | Remove over meta programming in AR::RelationBogdan Gusiev2016-08-234-94/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduced low level methods #set_value and #get_value for setting query attributes: relation.set_value(:where, {id: 1}) relation.get_value(:includes) Used those internally when working with relation's attributes at the abstract level
* | | Merge pull request #26258 from kamipo/remove_unnecessary_format_stringRafael França2016-08-231-15/+2
|\ \ \ | | | | | | | | Remove unnecessary `format_string`
| * | | Remove unnecessary `format_string`Ryuta Kamizono2016-08-231-15/+2
| | | | | | | | | | | | | | | | | | | | `format_string` is used for standardized column types/arguments spaces. Now the standardization was removed at df84e9867219e9311aef6f4efd5dd9ec675bee5c.
* | | | Merge pull request #26259 from riseshia/patch-1Rafael França2016-08-231-12/+6
|\ \ \ \ | | | | | | | | | | Improve 5.0 Release notes
| * | | | update `is renamed` to `tasks are renamed`Shia2016-08-231-1/+1
| | | | |
| * | | | Remove Duplicated information & fix typo...Shia2016-08-231-12/+6
| |/ / / | | | | | | | | | | | | | | | | - Remove Duplicated explanation. - Fix some typo. - Attach PR, commit link that missed one.
* | | | Merge pull request #26265 from ipmsteven/fixwordingRafael França2016-08-231-1/+1
|\ \ \ \ | |/ / / |/| | | remove extra … in comments
| * | | yl - remove extra …yunlei2016-08-231-1/+1
|/ / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 09:27:44 +0000