aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix the calling `merge` method at first in a scopesuginoy2016-07-193-1/+12
| | | | | | | | | | | | Changing the order of method chaining `merge` and other query method such as `joins` should produce the same result. ```ruby class Topic < ApplicationRecord scope :safe_chaininig, -> { joins(:comments).merge(Comment.newest) } scope :unsafe_chaininig, -> { merge(Comment.newest).joins(:comments) } #=> NoMethodError end ```
* Merge pull request #25883 from claudiob/fix-gotchaClaudio B2016-07-181-3/+3
|\ | | | | Fix docs in collection_radio_buttons
| * Fix docs in collection_radio_buttonsclaudiob2016-07-181-3/+3
|/ | | | [ci skip] Just some english and `<tt>` tags.
* Merge pull request #25881 from kamipo/logging_type_casted_bindsSean Griffin2016-07-181-1/+5
|\ | | | | Logging type casted binds
| * Logging type casted bindsRyuta Kamizono2016-07-191-1/+5
|/ | | | Fixes #22398.
* Merge pull request #25878 from alexcameron89/associations_docJon Moss2016-07-181-13/+13
|\ | | | | [ci skip] Fix grammar in AR::Associations
| * [ci skip] Fix grammar in AR::AssociationsAlex Kitchens2016-07-181-13/+13
|/
* deprecates the error_on_ignored_order_or_limit instance readerXavier Noria2016-07-182-2/+14
| | | | | | | | | Albeit the previous existence of this method is not seen in the patch itself, the declaration mattr_accessor :error_on_ignored_order_or_limit, instance_writer: false was present before. It was removed recently in 210012f.
* adds coverage for the deprecation of error_on_ignored_orderXavier Noria2016-07-181-0/+8
|
* Merge pull request #25866 from prathamesh-sonpatki/rm-deprecated-mattr-accessorXavier Noria2016-07-182-5/+12
|\ | | | | Followup of changes done to `error_on_ignored_order`
| * Fix documentation of `error_on_ignored_order` optionPrathamesh Sonpatki2016-07-181-4/+4
| | | | | | | | - Followup of https://github.com/rails/rails/commit/451437c6f57e66cc7586ec966e530493927098c7
| * Remove mattr_accessor for deprecated config `error_on_ignored_order_or_limit`.Prathamesh Sonpatki2016-07-181-1/+8
| | | | | | | | | | - It adds lot of warnings while running the tests. After https://github.com/rails/rails/commit/451437c6f57e66cc7586ec966e530493927098c7 it is not needed. - Added reader method with deprecation warning for backward compatibility.
* | Merge pull request #25867 from kamipo/no_need_public_sendMatthew Draper2016-07-171-2/+2
|\ \ | |/ |/| No need `public_send`
| * No need `public_send`Ryuta Kamizono2016-07-171-2/+2
|/
* Store the old logger before calling superRafael Mendonça França2016-07-171-1/+1
| | | | | | setup in ActiveSupport::LogSubscriber::TestHelper call set_logger that will change ActionController::Base.logger to the MockLogger so that logger will be always MockLogger
* Check if the logger exists before trying to use itRafael Mendonça França2016-07-171-1/+1
|
* Make sure the time method is unstubedRafael Mendonça França2016-07-171-29/+41
| | | | | | The minitest stubs were conflicting with the time travel stubs so the travel_back method call in the teardown block was actually keeping the time stubbed.
* Sort the mime types before comparingRafael Mendonça França2016-07-171-2/+2
| | | | | | | | | | | | | | For those tests that use start we don't need to assert the actual order of mime types that are returned. This happen because this order is more about the order the mime type was registered than the order that it is expected to it resolve. We need to sort because we remove the json mime type in json_params_parsing_test and add it to the end of the mime types set so if that file runs before those tests we will have a failing test. [Rafael Mendonça França + Lucas Hosseini]
* Make sure the tests setup are made correctlyRafael Mendonça França2016-07-171-9/+9
|
* Merge pull request #20818 from ↵Rafael França2016-07-174-0/+95
|\ | | | | | | | | jeremywadsack/use_transactional_fixtures_all_databases Use notification to ensure that lazy-loaded model classes have transactions
| * Create connection.active_record notification and use that to ensure that lazy-Jeremy Wadsack2016-07-124-0/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | loaded model classes have their connections wrapped in transactions. See #17776 In Rails 4 config.eager_load was changed to false in the test environment. This means that model classes that connect to alternate databases with establish_connection are not loaded at start up. If use_transactional_fixtures is enabled, transactions are wrapped around the connections that have been established only at the start of the test suite. So model classes loaded later don't have transactions causing data created in the alternate database not to be removed. This change resolves that by creating a new connection.active_record notification that gets fired whenever a connection is established. I then added a subscriber after we set up transactions in the test environment to listen for additional connections and wrap those in transactions as well.
* | Merge pull request #25811 from oss92/to_sentence_fallback_stringRafael França2016-07-173-3/+20
|\ \ | | | | | | Added :fallback_string option to Array#to_sentence
| * | Added :fallback_string option to Array#to_sentenceoss922016-07-133-3/+20
| | |
* | | Enable a few more rubocop rulesRafael Mendonça França2016-07-171-0/+13
| | |
* | | Merge pull request #25650 from ↵Rafael França2016-07-171-0/+3
|\ \ \ | | | | | | | | | | | | | | | | prathamesh-sonpatki/add-note-about-changelog-at-the-top Add a note about adding CHANGELOG entries at the top of the file
| * | | Add a note about adding CHANGELOG entries at the top of the file [ci skip]Prathamesh Sonpatki2016-07-021-0/+3
| | | |
* | | | Merge pull request #25864 from vipulnsward/fix-ap-testRafael França2016-07-171-0/+2
|\ \ \ \ | | | | | | | | | | Fix failing requirement of duplicable in ParameterFilter
| * | | | Fix failing requirement of duplicable in ParameterFilterVipul A M2016-07-161-0/+2
| | | | |
* | | | | Merge pull request #25850 from ojab/layout_doc_fixRafael Mendonça França2016-07-171-1/+4
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | Mention that layout can call a Proc [ci skip]
| * | | | Mention that layout can call a Proc [ci skip]ojab2016-07-151-1/+4
| | | | | | | | | | | | | | | | | | | | Also document return values for Proc/Symbol arguments
* | | | | Merge pull request #25861 from vipulnsward/fix-grammerRafael França2016-07-171-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix CHANGELOG grammar [ci skip]
| * | | | | Fix CHANGELOG grammar [ci skip]Vipul A M2016-07-161-2/+2
|/ / / / /
* | | | | Merge pull request #25860 from prathamesh-sonpatki/add-cg-for-rails-initializersRafael França2016-07-173-3/+16
|\ \ \ \ \ | | | | | | | | | | | | CHANGELOG for https://github.com/rails/rails/pull/25257 [ci skip]
| * | | | | CHANGELOG for https://github.com/rails/rails/pull/25257 [ci skip]Prathamesh Sonpatki2016-07-173-3/+16
|/ / / / / | | | | | | | | | | | | | | | - Also minor weekly CHANGELOG cleanup.
* | | | | Merge pull request #25815 from greysteil/add-newline-between-structure-versionsRafael França2016-07-162-2/+9
|\ \ \ \ \ | | | | | | | | | | | | Add newline between each migration in `structure.sql`
| * | | | | Add newline between each migration in `structure.sql`Grey Baker2016-07-142-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keeps schema migration inserts as a single commit, so we still get all of the benefits of https://github.com/rails/rails/commit/42dd2336b31a8d98776d039a2b9fd7f834156a78, but allows for easier git diff-ing. Fixes #25504.
* | | | | | Merge pull request #25775 from ↵Eileen M. Uchitelle2016-07-161-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | junaruga/hotfix/actionpack-depending-on-activerecord Remove unused activerecord requirement in actionpack.
| * | | | | | Remove unused activerecord requirement in actionpack.Jun Aruga2016-07-111-1/+0
| | | | | | |
* | | | | | | Merge pull request #25854 from prathamesh-sonpatki/fix-test-nameEileen M. Uchitelle2016-07-161-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix wrong test name
| * | | | | | | Fix wrong test namePrathamesh Sonpatki2016-07-161-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | - Followup of https://github.com/rails/rails/pull/23179
* | | | | | | Merge pull request #25853 from CodingItWrong/remove-reference-indexes-in-docsVipul A M2016-07-161-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update references generation docs to exclude index
| * | | | | | | Update references generation docs to exclude indexJosh Justice2016-07-161-2/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In #23179 the migration generator was changed to no longer output `index: true` for `references` migrations. This updates the migrations guide to remove `index: true` from relevant examples. [ci skip]
* | | | | | | Merge pull request #25851 from y-yagi/add_missing_bracesVipul A M2016-07-151-2/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | add missing braces [ci skip]
| * | | | | | add missing braces [ci skip]yuuji.yaginuma2016-07-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also modify to use Ruby 1.9+ syntax.
* | | | | | | Merge pull request #25826 from javan/actionview/trim-digestor-template-lookupsRafael França2016-07-151-2/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Eliminate extra template lookup in ActionView::Digestor
| * | | | | | Eliminate extra template lookup in ActionView::DigestorJavan Makhmali2016-07-141-2/+1
| | | | | | |
* | | | | | | Merge pull request #25845 from znz/fix-broken-linkArun Agrawal2016-07-151-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix broken link [ci skip]
| * | | | | | | Fix broken linkKazuhiro NISHIYAMA2016-07-151-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #25844 from tyamagu2/empty_typoप्रथमेश Sonpatki2016-07-151-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ci skip] fix a typo
| * | | | | | | [ci skip] fix a typoYamaguchi.Tomoki2016-07-151-1/+1
|/ / / / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 10:15:37 +0000