aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'fbdcf5221ad7ea3d40ad09651962fc85d101dd67'Matthew Draper2016-05-0722-44/+88
|\ | | | | | | Preparing for 5.0.0.rc1 release
| * Preparing for 5.0.0.rc1 releaseRafael Mendonça França2016-05-0622-44/+88
| |
* | Merge pull request #24886 from rails/maclover7-patch-1Jon Moss2016-05-075-20/+20
|\ \ | | | | | | http --> https
| * | http --> httpsJon Moss2016-05-065-20/+20
| |/ | | | | | | [ci skip]
* | Merge pull request #24904 from jonatack/helpers-grammar-fixesJon Moss2016-05-071-2/+2
|\ \ | |/ |/| Helpers doc grammar fix [skip ci]
| * Helpers doc grammar fix [skip ci]Jon Atack2016-05-071-2/+2
|/
* Fix etag expectation to work with the SHA256Rafael Mendonça França2016-05-061-1/+1
| | | | It is related with https://github.com/rack/rack/commit/7b66d2cdb80a4d6b44fa8c61d92e25fbbda1f152
* Sign the tags when releasingRafael Mendonça França2016-05-061-1/+1
|
* Upgrade all gems to make sure Rails works with rack 2.0.0.rc1Rafael Mendonça França2016-05-061-35/+37
|
* Merge pull request #24844 from arthurnn/arthurnn/connArthur Nogueira Neves2016-05-0611-92/+109
|\ | | | | Refactor connection handler
| * Update docs for connection handlerArthur Neves2016-05-061-2/+5
| | | | | | | | [skip ci]
| * s/specification_name/connection_specification_nameArthur Neves2016-05-064-14/+14
| |
| * s/specification_id/specification_nameArthur Neves2016-05-058-48/+48
| |
| * Retrive the right pool for db tasksArthur Neves2016-05-051-2/+2
| |
| * inline retrive_conn_pool methodArthur Neves2016-05-051-12/+8
| |
| * Better code readabilityArthur Neves2016-05-052-4/+2
| |
| * Test to swap connection at runtimeArthur Neves2016-05-051-0/+7
| |
| * fix testArthur Neves2016-05-051-8/+7
| |
| * Add spec_id testsArthur Neves2016-05-051-0/+9
| |
| * Use spec key, when given as spec_idArthur Neves2016-05-052-20/+23
| |
| * Better specification_id methodArthur Neves2016-05-051-10/+7
| |
| * Rename methodArthur Neves2016-05-051-3/+3
| |
| * Refactor connection handlerArthur Neves2016-05-059-83/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ConnectionHandler will not have any knowlodge of AR models now, it will only know about the specs. Like that we can decouple the two, and allow the same model to use more than one connection. Historically, folks used to create abstract AR classes on the fly in order to have multiple connections for the same model, and override the connection methods. With this, now we can override the `specificiation_id` method in the model, to return a key, that will be used to find the connection_pool from the handler.
* | Make flash messages cookie compatible with Rails 4Rafael Mendonça França2016-05-062-3/+3
| | | | | | | | | | | | | | | | In #18721 we removed the discard key from the session hash used to flash messages and that broke compatibility with Rails 4 applications because they try to map in the discarded flash messages and it returns nil. Fixes #24726.
* | Merge pull request #24896 from prathamesh-sonpatki/api-cleanupGuillermo Iguaran2016-05-061-7/+0
|\ \ | | | | | | BoomerAPI is not used anywhere, so removed it!
| * | BoomerAPI is not used anywhere, so removed it!Prathamesh Sonpatki2016-05-061-7/+0
| | | | | | | | | | | | | | | - It was originally added in 83b4e9073f0852afc065 and partially removed in 05d89410bf97d0778e7.
* | | Merge pull request #24894 from prathamesh-sonpatki/release-notes-19282Rafael França2016-05-061-0/+4
|\ \ \ | | | | | | | | Release notes: Add a note about `use_transactional_tests` in the deprecated section of Active Record notes [ci skip]
| * | | Release notes: Add a note about `use_transactional_tests` in the deprecated ↵Prathamesh Sonpatki2016-05-061-0/+4
| |/ / | | | | | | | | | | | | | | | section of Active Record notes [ci skip] - Followup of PR #19282.
* | | Merge pull request #24889 from lvl0nax/as_array_split_refactoringRafael França2016-05-061-11/+6
|\ \ \ | | | | | | | | Array#split refactoring for case with block
| * | | Array#split refactoring for case with blocklvl0nax2016-05-061-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calculating ------------------------------------- before 26.319k i/100ms after 29.414k i/100ms ------------------------------------------------- before 350.623k (± 1.6%) i/s - 1.763M after 416.227k (± 1.4%) i/s - 2.088M Comparison: after: 416226.8 i/s before: 350622.8 i/s - 1.19x slower
* | | | Merge pull request #24029 from ↵Sean Griffin2016-05-066-19/+70
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | rthbound/dont-call-each-when-calling-body-on-response Dont call each when calling body on response to fix #23964 Fixes #23964
| * | | Fixes #23964Ryan T. Hosford2016-03-136-19/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Adds #each_chunk to ActionDispatch::Response. it's a method which will be called by ActionDispatch::Response#each. - Make Response#each a proper method instead of delegating to @stream - In Live, instead of overriding #each, override #each_chunk. - `#each` should just spit out @str_body if it's already set - Adds #test_set_header_after_read_body_during_action to prove this fixes #23964 - Adds #test_each_isnt_called_if_str_body_is_written to ensure #each_chunk is not called when @str_body is available - Call `@response.sent!` in AC::TestCase's #perform so a test response acts a bit more like a real response. Makes test that call `#assert_stream_closed` pass again. - Additionally assert `#committed?` in `#assert_stream_closed` - Make test that was calling @response.stream.each pass again by calling @response.each instead.
* | | | Merge pull request #24871 from vipulnsward/disable-transaction-failureArthur Nogueira Neves2016-05-061-0/+2
|\ \ \ \ | | | | | | | | | | Fix failures due to transactions
| * | | | We are erroring due to nested transaction failures from mysql on ↵Vipul A M2016-05-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test_migrate_clears_schema_cache_afterward test. Disable transactions for this test. Fixes #24391
* | | | | Merge pull request #24892 from javiervidal/2_3_release_notesVipul A M2016-05-061-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Fix broken links in 'Ruby on Rails 2.3 Release Notes' [ci skip]
| * | | | | Fix broken links in 'Ruby on Rails 2.3 Release Notes' [ci skip]Javier Vidal2016-05-061-4/+4
| | | | | |
* | | | | | Allow the connection adapters to determine the order of bind paramsSean Griffin2016-05-063-4/+46
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 5.0 we use bind parameters for limit and offset, while in 4.2 we used the values directly. The code as it was written assumed that limit and offset worked as `LIMIT ? OFFSET ?`. Both Oracle and SQL Server have a different syntax, where the offset is stated before the limit. We delegate this behavior to the connection adapter so that these adapters are able to determine how the bind parameters are flattened based on what order their specification has the various clauses appear. Fixes #24775
* | | | | Merge pull request #24888 from javiervidal/configuringJon Moss2016-05-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix link in 'Configuring Rails Applications' [ci skip]
| * | | | | Fix link in 'Configuring Rails Applications' [ci skip]Javier Vidal2016-05-061-1/+1
|/ / / / /
* | | | | Merge pull request #24885 from javiervidal/3_0_release_notesEileen M. Uchitelle2016-05-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix link in 'Ruby on Rails 3.0 Release Notes' [ci skip]
| * | | | | Fix link in 'Ruby on Rails 3.0 Release Notes' [ci skip]Javier Vidal2016-05-061-1/+1
|/ / / / /
* | | | | Merge pull request #24884 from javiervidal/markdown_syntax_2_2_release_notesVipul A M2016-05-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix markdown syntax in 'Ruby on Rails 2.2 Release Notes' [ci skip]
| * | | | | Fix markdown syntax in 'Ruby on Rails 2.2 Release Notes' [ci skip]Javier Vidal2016-05-061-1/+1
|/ / / / /
* | | | | Merge pull request #24881 from prathamesh-sonpatki/add-24866-to-relaese-notesKasper Timm Hansen2016-05-062-1/+5
|\ \ \ \ \ | |/ / / / |/| | | | [ci skip] Release notes: Add PR #24866 to release notes
| * | | | Release notes: Add PR #24866 to release notesPrathamesh Sonpatki2016-05-052-1/+5
|/ / / /
* | | | Merge pull request #24866 from rafaelfranca/actionview-helpersArthur Nogueira Neves2016-05-055-7/+33
|\ \ \ \ | | | | | | | | | | Implement helpers proxy in controller instance level
| * | | | Implement helpers proxy in controller instance levelRafael Mendonça França2016-05-054-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is a common pattern in the Rails community that when people want to :xa use any kind of helper that is defined inside app/helpers they includes the helper module inside the controller like: module UserHelper def my_user_helper # ... end end class UsersController < ApplicationController include UserHelper def index render inline: my_user_helper end end This has problem because the helper can't access anything that is defined in the view level context class. Also all public methods of the helper become available in the controller what can lead to undesirable methods being routed and behaving as actions. Also if you helper depends on other helpers or even Action View helpers you need to include each one of these dependencies in your controller otherwise your helper is not going to work. We already have a helpers proxy at controller class level but that proxy doesn't have access to the instance variables defined in the controller. With this new instance level helper proxy users can reuse helpers in the controller without having to include the modules and with access to instance variables defined in the controller. class UsersController < ApplicationController def index render inline: helpers.my_user_helper end end
| * | | | Move protected instance variable to the right placeRafael Mendonça França2016-05-052-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were a lot of protected instance variables in AbsctractController::Rendering that were related to Action Controller and Action View. Moving to ActionController::Base's protected instance list we make it closer to where they are really defined.
* | | | | Merge pull request #24799 from prathamesh-sonpatki/18439-followupRafael França2016-05-052-12/+23
|\ \ \ \ \ | | | | | | | | | | | | Active Model: Improve CHANGELOG and documentation for `validates_acceptance_of` [ci skip]
| * | | | | Active Model: Improve CHANGELOG and documentation for ↵Prathamesh Sonpatki2016-05-052-12/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `validates_acceptance_of` [ci skip] - Improve CHANGELOG entry for #18439. - The documentation is updated as per changes in PR #18439 to the `accept` option. - The explanation about the virtual attribute is moved at the end so that the arity of `accept` option is explained first. - Added a note that `message` can also be passed to `validates_acceptance_of`.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 12:27:53 +0000