aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* 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
|/ / /
* | | Merge pull request #26228 from kamipo/remove_unnecessary_any_and_manyRafael França2016-08-232-28/+12
|\ \ \ | | | | | | | | Remove unnecessary `any?` and `many?` methods for collection proxy
| * | | Remove unnecessary `any?` and `many?` methods for collection proxyRyuta Kamizono2016-08-192-28/+12
| | | | | | | | | | | | | | | | Simply use its own methods because `CollectionProxy` inherits `Relation`.
* | | | Merge pull request #26254 from badosu/improve-tag-optionRafael França2016-08-231-2/+2
|\ \ \ \ | | | | | | | | | | Improve #tag_option performance
| * | | | Improve TagHelper#tag_option performanceAmadeus Folego2016-08-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Freeze string literals and use String instead of Regex inside gsub call. This should improve performance from 20% up to 50% on most cases.
* | | | | Merge pull request #26205 from pedaling-corp/fix/active-job-resqueRafael Mendonça França2016-08-233-2/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Add @queue variable to JobWrapper
| * | | | | Added instance variable `@queue` to JobWrapper.InJung Chung2016-08-193-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will fix issues in [resque-scheduler](https://github.com/resque/resque-scheduler) `#job_to_hash` method, so we can use `#enqueue_delayed_selection`, `#remove_delayed` method in resque-scheduler smoothly.
* | | | | | Merge pull request #26253 from kamipo/fix_ci_failureRafael França2016-08-231-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix CI failure caused by df84e9867219e9311aef6f4efd5dd9ec675bee5c
| * | | | | | Fix CI failure caused by df84e9867219e9311aef6f4efd5dd9ec675bee5cRyuta Kamizono2016-08-231-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #26231 from philipqnguyen/scoped-dependent-destroyJon Moss2016-08-221-0/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Doc on scoped has_many, dependent: :destroy
| * | | | | Doc on scoped has_many, dependent: :destroyPhilip Nguyen2016-08-221-0/+6
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to close #26111 Developers need to be aware that `dependent: :destroy` on a scoped `has_many` association would only destroy the associated objects in that scope. Potentially leaving other associated objects outside that scope untouched.
* | | | | Include the content of the flash in the auto-generated etag (#26250)David Heinemeier Hansson2016-08-225-0/+59
| | | | | | | | | | | | | | | Include the content of the flash in the auto-generated etag
* | | | | Merge pull request #26249 from rafamanzo/add_redis_to_development_dependenciesRafael França2016-08-221-0/+43
|\ \ \ \ \ | | | | | | | | | | | | Update docs with Action Cable Redis dependency
| * | | | | [ci skip] Update docs with Action Cable Redis dependencyRafael Reggiani Manzo2016-08-221-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Action Cable's test `test/subscription_adapter/redis_test.rb` fail if Redis is not installed and running. Following the guides `development_dependen there's no mention to this.
* | | | | | Remove the SchemaDumper options and change the default behaviorRafael Mendonça França2016-08-224-137/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the schema dumper by default doesn't align the types and arguments in the ruby format anymore.
* | | | | | Merge pull request #26248 from wjordan/remove-dynamic-segments-docप्रथमेश Sonpatki2016-08-221-25/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove `:action` and `:controller` segments from routing guide
| * | | | | | Remove `:action` and `:controller` segments from routing guideWill Jordan2016-08-221-25/+11
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Fixes #26247. [ci skip]
* | | | | | Merge pull request #25750 from go2null/go2null-test-directoriesEileen M. Uchitelle2016-08-221-2/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Specified directories for routes, views and jobs tests
| * | | | | Clearly state purpose of test directoriesgo2null2016-08-221-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added location for route, view and job tests to section 2.1. (They are currently only defined in sections 8 Testing Views and 11 Testing Jobs.) * Added location for route test in section 7 Testing Routes. (Currently only defined in section 8 Testing Views.)
* | | | | | Merge pull request #23941 from chiragsinghal/patch-1Kasper Timm Hansen2016-08-223-1/+43
|\ \ \ \ \ \ | | | | | | | | | | | | | | Return 307 status instead of 301 when rerouting POST requests to SSL
| * | | | | | Return 307 status instead of 301 when rerouting POST requests to SSLChirag Singhal2016-08-223-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `config.force_ssl` is set to `true`, any POST/PUT/DELETE requests coming in to non-secure url are being redirected with a 301 status. However, when that happens, the request is converted to a GET request and ends up hitting a different action on the controller. Since we can not do non-GET redirects, we can instead redirect with a 307 status code instead to indicate to the caller that a fresh request should be tried preserving the original request method. `rack-ssl` gem which was used to achieve this before we had this middleware directly baked into Rails also used to do the same, ref: https://github.com/josh/rack-ssl/blob/master/lib/rack/ssl.rb#L54 This would be specially important for any apps switching from older version of Rails or apps which expose an API through Rails.
* | | | | | | Merge pull request #26245 from danila/quering-interface-guideVipul A M2016-08-221-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Change form of table name to plural in quering interface guides [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 23:06:53 +0000