aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* 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
| | | |
* | | | Merge pull request #24831 from y-yagi/remove_empty_from_changelogEileen M. Uchitelle2016-05-031-2/+1
|\ \ \ \ | |/ / / |/| | | remove `empty?` from CHANGELOG [ci skip]
| * | | remove `empty?` from CHANGELOG [ci skip]yuuji.yaginuma2016-05-031-2/+1
|/ / / | | | | | | | | | Follow up to 98264a1343fad6bb6637893a37fd571916b4158c
* | | Fix template resolver cache concurrency: "can't add a new key into hash ↵Jeremy Daer2016-05-022-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | during iteration" Resolved by https://github.com/ruby-concurrency/concurrent-ruby/pull/529 Fixes #24627.
* | | Do not delegate `AR::Base#empty?` to `all`Sean Griffin2016-05-022-7/+1
|/ / | | | | | | | | | | | | | | | | | | Unlike `one?` and `none?`, `empty?` has interactions with methods outside of enumerable. It also doesn't fit in the same vein. `Topic.any?` makes sense. `Topic.empty?` does not, as `Topic` is not a container. Fixes #24808 Close #24812
* | Merge pull request #24810 from willnet/fix-actioncable-readmeप्रथमेश Sonpatki2016-05-021-1/+1
|\ \ | | | | | | [ci skip] Fix ActionCable README
| * | [ci skip] Fix ActionCable READMEwillnet2016-05-021-1/+1
|/ / | | | | | | default worker pool size was changed from 100 to 4 at #24376
* | Merge pull request #24807 from kamipo/add_nodoc_to_schema_creationVipul A M2016-05-021-1/+1
|\ \ | | | | | | Add `:nodoc:` to `schema_creation` [ci skip]
| * | Add `:nodoc:` to `schema_creation` [ci skip]Ryuta Kamizono2016-05-021-1/+1
|/ / | | | | | | | | | | | | `schema_creation` is not public API. https://github.com/rails/rails/blob/v5.0.0.beta4/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L121 https://github.com/rails/rails/blob/v5.0.0.beta4/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L78
* | Merge pull request #24713 from tomkadwill/fix_counter_cache_incrementSean Griffin2016-04-303-0/+14
|\ \ | | | | | | | | | | | | Fix counter_cache double increment bug Close #24183
| * | Fix counter_cache double increment bugTom Kadwill2016-04-283-0/+14
| | |
* | | Replace ActionDispatch::LoadInterlock with ActionDispatch::Executor in ↵willnet2016-04-304-5/+5
| | | | | | | | | | | | | | | | | | | | | guides [ci skip] Guides should be updated because ActionDispatch::LoadInterlock was replaced with ActionDispatch::Executor at #23807.
* | | Fix initial value effects for sum along to ruby 2.4Kenta Murata2016-04-302-5/+85
| | | | | | | | | | | | Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
* | | Merge pull request #24801 from y-yagi/fix_incorrect_module_nameJon Moss2016-04-301-1/+1
|\ \ \ | | | | | | | | fix incorrect module name [ci skip]
| * | | fix incorrect module name [ci skip]yuuji.yaginuma2016-05-011-1/+1
|/ / /
* | | Merge pull request #24798 from mrkjlchvz/mc-grammarVipul A M2016-05-010-0/+0
|\ \ \ | | | | | | | | Fix grammar. [ci skip]
| * | | Fix grammar.Mark2016-05-011-1/+1
| | | |
* | | | Merge pull request #24791 from maclover7/jm-rm-ar-rails-mentionRafael França2016-04-302-1/+5
|\ \ \ \ | | | | | | | | | | Replace `Rails.version.to_f` with Active Record
| * | | | Replace `Rails.version.to_f` with Active RecordJon Moss2016-04-302-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Rails should not be explicity mentioned within Active Record, since railties and the Rails ecosystem is not required for use.
* | | | | Merge pull request #24777 from tomkadwill/action_pack_typos_3Vipul A M2016-04-302-5/+5
|\ \ \ \ \ | | | | | | | | | | | | Fix actionpack typos [ci skip]
| * | | | | Fix actionpack typos [ci skip]Tom Kadwill2016-04-302-5/+5
| | |_|_|/ | |/| | |
* | | | | add #24385 to 5.0 release notes [ci skip]yuuji.yaginuma2016-04-291-0/+7
| |/ / / |/| | |
* | | | rm unused requireVipul A M2016-04-291-1/+0
| | | | | | | | | | | | | | | | Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
* | | | Extract `add_sql_comment!` methodRyuta Kamizono2016-04-293-20/+13
| | | | | | | | | | | | | | | | | | | | | | | | Refactor of #22911. Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
* | | | Treat blank comments as no comment for indexesRyuta Kamizono2016-04-293-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | Follow up of 1683410. Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
* | | | Migrations: move version-finding responsibilityyui-knk2016-04-292-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `ActiveRecord::Migration` needn't know about migration version compatibility lookup. Delegate it to the Compatibility module. Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
* | | | restores the regexp used in String#blank?Xavier Noria2016-04-291-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit undoes 54243fe. Reason: Further investigation has shown the benefit is not so clear generally speaking. There is a long discussion and several benchmarks in the PR #24658 if you are interested in the details.
* | | | Chomp: prefer String#chomp where we can for a clarity boostlvl0nax2016-04-293-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | Closes #24766, #24767 Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
* | | | AS::Duration changelog polishJeremy Daer2016-04-291-15/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the updated changelog from the first merge: 7254517 References #22806, #24762. [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 09:49:03 +0000