aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | 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`.
* | | | | | | | | | | | | | | | Merge pull request #24589 from vipulnsward/am-fragment-cacheRafael França2016-05-055-3/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expand on Action Mailer Fragment caching tests
| * | | | | | | | | | | | | | | | Expand on Action Mailer Fragment caching testsVipul A M2016-04-176-4/+63
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #24806 from vipulnsward/errors-details-testRafael França2016-05-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Followup of #18322
| * | | | | | | | | | | | | | | | | Followup of #18322Vipul A M2016-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mirror the documented new behavior of including details, when performing errors test.
* | | | | | | | | | | | | | | | | | Merge pull request #24869 from vipulnsward/change-exampleRafael França2016-05-051-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change to use a more realistic example [ci skip]
| * | | | | | | | | | | | | | | | | | Change to use a more realistic example and not giving the impression that ↵Vipul A M2016-05-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | destroy_all is preferred way to destroy related records. This example just wants to demonstrate callback behaviour. [ci skip]
* | | | | | | | | | | | | | | | | | | Merge pull request #24868 from vipulnsward/delegate_encode_withRafael França2016-05-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | delegate encode_with instead of to_yaml, which is deprecated
| * | | | | | | | | | | | | | | | | | delegate encode_with instead of to_yaml, which is deprecatedVipul A M2016-05-051-1/+1
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #24860 from maclover7/jm-rm-spaceRafael França2016-05-051-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | Remove extra space [ci skip]
| * | | | | | | | | | | | | | | | | | Remove extra space [ci skip]Jon Moss2016-05-051-2/+2
| | |_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | [ci skip] Don't promote SQL interpolation.Kasper Timm Hansen2016-05-051-2/+2
| |_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After fb898e9, the `before_destroy` had some code that used SQL interpolation left over. Don't think we should promote that even if the values aren't directly from user input.
* | | | | | | | | | | | | | | | | Merge pull request #24859 from y-yagi/do_not_pass_conditon_to_destroy_allVipul A M2016-05-052-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do not pass conditions to `#destroy_all` [ci skip]
| * | | | | | | | | | | | | | | | | do not pass conditions to `#destroy_all` [ci skip]yuuji.yaginuma2016-05-052-3/+3
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing conditions to `#destroy_all` was deprecated in c82c5f8.
* | | | | | | | | | | | | | | | | Merge pull request #24780 from rails/run-as-test-in-both-to-time-modesAndrew White2016-05-054-6/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | Run Active Support tests in both `to_time` modes
| * | | | | | | | | | | | | | | | Run Active Support tests when preserving timezonesAndrew White2016-05-052-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add to the matrix of Travis tests an entry that runs the Active Support tests when `ActiveSupport.to_time_preserves_timezone = true`.
| * | | | | | | | | | | | | | | | Fix tests when preserving timezonesAndrew White2016-05-052-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These two tests are explicitly testing that to_time is returning times with the sytem timezone's UTC offset, therefore they will fail when running them with `ActiveSupport.to_time_preserves_timezone = true`.
| * | | | | | | | | | | | | | | | Fix to_yaml test when run individuallyAndrew White2016-05-051-0/+1
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The to_yaml method is undefined when running the test as: $ ruby -I lib:test test/core_ext/string_ext_test.rb Doesn't fail when running rake test:isolated presumably because something else has required 'yaml' already.
* | | | | | | | | | | | | | | | Merge pull request #24820 from maclover7/fix-15843Kasper Timm Hansen2016-05-042-1/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure compatibility between ActionDispatch::Request::Session and Rack
| * | | | | | | | | | | | | | | | Ensure compatibility between ActionDispatch::Request::Session and RackJon Moss2016-05-042-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding the `each` method is required for ensuring compatibility between Rails, and other Rack frameworks (like Sinatra, etc.), that are mounted within Rails, and wish to use its session tooling. Prior to this, there was an inconsistency between ActionDispatch::Request::Session and Rack::Session::Cookie, due to the absence of the `each` method. This should hopefully fix that error. :) For a full integration test with Sinatra and a standalone Rack application, you can check out the gist for that here: https://gist.github.com/maclover7/08cd95b0bfe259465314311941326470. Solves #15843.
* | | | | | | | | | | | | | | | | Merge pull request #24851 from maclover7/jm-bump-ruby-versionsKasper Timm Hansen2016-05-041-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump Ruby versions
| * | | | | | | | | | | | | | | | | Bump Ruby versionsJon Moss2016-05-041-3/+3
| |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2.2.4 --> 2.2.5 2.3.0 --> 2.3.1
* | | | | | | | | | | | | | | | | Merge pull request #24852 from jrafanie/fix_typosVipul A M2016-05-048-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | Fix some typos in comments [ci skip]
| * | | | | | | | | | | | | | | | Fix some typos in comments.Joe Rafaniello2016-05-048-8/+8
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | renames ActionCable::Railtie to ActionCable::EngineXavier Noria2016-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an engine living in action_cable/engine.rb, convention is to call these things *::Engine. Looking at thi git history looks like the current *::Railtie was just an accident.
* | | | | | | | | | | | | | | | Merge pull request #24845 from tomkadwill/action_controller_typosRafael França2016-05-042-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | Fix actionpack typos [ci skip]
| * | | | | | | | | | | | | | | Fix actionpack typos [ci skip]Tom Kadwill2016-05-042-3/+3
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #24839 from vipulnsward/fix-bundler-ciRafael França2016-05-034-7/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Depend on bundler 1.11.2 on travis until bundle update discrepancy is solved on 1.12.x
| * | | | | | | | | | | | | | | Followup of #24835Vipul A M2016-05-034-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix failing tests
| * | | | | | | | | | | | | | | Depend on bundler 1.11.2 on travis until bundle update discrepancy is solved ↵Vipul A M2016-05-031-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on 1.12.x
* | | | | | | | | | | | | | | | Check for the right exceptionRafael Mendonça França2016-05-031-1/+1
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #24835 from christianblais/activemodel/rangeerrorRafael França2016-05-034-7/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change RangeError to a more specific ActiveModel::RangeError
| * | | | | | | | | | | | | | | Change RangeError to a more specific ActiveModel::RangeErrorChristian Blais2016-05-034-7/+12
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The should make it easier for apps to rescue ActiveModel specific errors without the need to wrap all method calls with a generic rescue RangeError.
* | | | | | | | | | | | | | | Merge pull request #24832 from prathamesh-sonpatki/fix-release-notesKasper Timm Hansen2016-05-031-10/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Release notes: Remove duplicate entries
| * | | | | | | | | | | | | | | Release notes: Remove duplicate entries [ci skip]Prathamesh Sonpatki2016-05-031-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed duplicate entry for collection caching. - The entry was duplicate and the link to PR was also wrong. - Consolidated entries for `belongs_to` required by default.
* | | | | | | | | | | | | | | | Merge pull request #24833 from Erol/fix-typoप्रथमेश Sonpatki2016-05-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix small typo in Active Record Migrations documentation
| * | | | | | | | | | | | | | | | Fix small typo in Active Record Migrations documentation [ci skip]Erol Fornoles2016-05-031-1/+1
| | | | | | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-21 22:55:06 +0000