aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix explain logging with bindsRyuta Kamizono2016-07-204-17/+28
* Merge pull request #25438 from prathamesh-sonpatki/rm-session-store-initializerRafael Mendonça França2016-07-2010-29/+49
|\
| * Setup default session store internally, no longer through an application init...Prathamesh Sonpatki2016-07-1710-20/+32
| * Refactor the existing session_store to use keyword args and raise early when ...Prathamesh Sonpatki2016-07-171-9/+14
| * Introduce a new method for checking whether session_store is set by user or b...Prathamesh Sonpatki2016-07-171-0/+4
* | Merge pull request #25578 from kamipo/move_warning_about_composite_primary_ke...Rafael França2016-07-207-20/+39
|\ \
| * | Move the warning about composite primary key to `AttributeMethods::PrimaryKey`Ryuta Kamizono2016-07-027-20/+39
* | | Merge pull request #25520 from st0012/fix-current-pageRafael França2016-07-202-0/+8
|\ \ \
| * | | Fix ActionView::Helpers#current_page? with issue in https://github.com/rails/...Stan Lo2016-07-202-0/+8
* | | | Merge pull request #25889 from kamipo/do_not_dup_binds_in_to_sqlRafael França2016-07-201-1/+1
|\ \ \ \
| * | | | Do not `binds.dup` in `connection#to_sql`Ryuta Kamizono2016-07-191-1/+1
* | | | | Merge pull request #25888 from kamipo/use_conn_to_sql_for_construct_sqlRafael França2016-07-201-10/+5
|\ \ \ \ \
| * | | | | Use `connection#to_sql` for construct an SQLRyuta Kamizono2016-07-191-10/+5
| |/ / / /
* | | | | Merge pull request #25823 from mechanicles/missing-memory-store-testsRafael França2016-07-201-0/+10
|\ \ \ \ \
| * | | | | Add missing tests for memory store of cache.Santosh Wadghule2016-07-171-0/+10
* | | | | | Merge pull request #25849 from suginoy/fix_merge_in_scopeRafael Mendonça França2016-07-203-1/+12
|\ \ \ \ \ \
| * | | | | | Fix the calling `merge` method at first in a scopesuginoy2016-07-193-1/+12
* | | | | | | Merge pull request #25828 from bogdanvlviv/ref_default_sequence_nameRafael França2016-07-202-4/+5
|\ \ \ \ \ \ \
| * | | | | | | Refactored test `HasManyAssociationsTest#test_do_not_call_callbacks_for_delet...bogdanvlviv2016-07-171-1/+2
| * | | | | | | Refactored method `ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaStatem...bogdanvlviv2016-07-171-3/+3
* | | | | | | | Merge pull request #25393 from gsamokovarov/introduce-assert-changesRafael França2016-07-203-9/+236
|\ \ \ \ \ \ \ \
| * | | | | | | | Introduce `assert_changes` and `assert_no_changes`Genadi Samokovarov2016-07-173-9/+236
* | | | | | | | | Merge pull request #25834 from alpaca-tc/fixes_multiparameter_attributes_on_t...Rafael França2016-07-203-1/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixes multiparameter attributes conversion with time_zone_aware_attributes an...alpaca-tc2016-07-193-1/+19
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #25822 from mechanicles/clear-local-cache-on-invalid-param...Rafael França2016-07-201-0/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add missing test for clearing up local cache on invalid parameters err.Santosh Wadghule2016-07-171-0/+12
* | | | | | | | | | Merge pull request #25869 from kamipo/specificiation_id_was_renamed_to_spec_nameRafael França2016-07-201-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | `specificiation_id` was renamed to `spec_name`Ryuta Kamizono2016-07-181-1/+1
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #25868 from kamipo/fix_payload_class_name_to_spec_nameRafael França2016-07-205-13/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix `payload[:class_name]` to `payload[:spec_name]`Ryuta Kamizono2016-07-175-13/+10
* | | | | | | | | | | Add a new rule to rubocopRafael Mendonça França2016-07-201-10/+13
| |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #25780 from Ropeney/patch-1Matthew Draper2016-07-191-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update ActionCable Rebroadcasting a Message documentationJoseph Mullins2016-07-121-1/+1
* | | | | | | | | | | Merge pull request #25886 from kamipo/pass_type_casted_binds_to_log_subscriberXavier Noria2016-07-196-25/+29
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Pass `type_casted_binds` to log subscriber for logging bind values properlyRyuta Kamizono2016-07-196-25/+29
* | | | | | | | | | | Merge pull request #25883 from claudiob/fix-gotchaClaudio B2016-07-181-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix docs in collection_radio_buttonsclaudiob2016-07-181-3/+3
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #25881 from kamipo/logging_type_casted_bindsSean Griffin2016-07-181-1/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Logging type casted bindsRyuta Kamizono2016-07-191-1/+5
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #25878 from alexcameron89/associations_docJon Moss2016-07-181-13/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [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
* | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix documentation of `error_on_ignored_order` optionPrathamesh Sonpatki2016-07-181-4/+4
| * | | | | | | | | Remove mattr_accessor for deprecated config `error_on_ignored_order_or_limit`.Prathamesh Sonpatki2016-07-181-1/+8
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #25867 from kamipo/no_need_public_sendMatthew Draper2016-07-171-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | 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
* | | | | | | | Check if the logger exists before trying to use itRafael Mendonça França2016-07-171-1/+1