aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Make sure the time method is unstubedRafael Mendonça França2016-07-171-29/+41
* | Sort the mime types before comparingRafael Mendonça França2016-07-171-2/+2
* | Make sure the tests setup are made correctlyRafael Mendonça França2016-07-171-9/+9
* | Merge pull request #20818 from jeremywadsack/use_transactional_fixtures_all_d...Rafael França2016-07-174-0/+95
|\ \
| * | Create connection.active_record notification and use that to ensure that lazy-Jeremy Wadsack2016-07-124-0/+95
* | | Merge pull request #25811 from oss92/to_sentence_fallback_stringRafael França2016-07-173-3/+20
|\ \ \
| * | | 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 prathamesh-sonpatki/add-note-about-changelog-a...Rafael França2016-07-171-0/+3
|\ \ \ \
| * | | | 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 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]ojab2016-07-151-1/+4
* | | | | | Merge pull request #25861 from vipulnsward/fix-grammerRafael França2016-07-171-2/+2
|\ \ \ \ \ \
| * | | | | | 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]Prathamesh Sonpatki2016-07-173-3/+16
|/ / / / / /
* | | | | | 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`Grey Baker2016-07-142-2/+9
* | | | | | | Merge pull request #25775 from junaruga/hotfix/actionpack-depending-on-active...Eileen M. Uchitelle2016-07-161-1/+0
|\ \ \ \ \ \ \
| * | | | | | | 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 namePrathamesh Sonpatki2016-07-161-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #25853 from CodingItWrong/remove-reference-indexes-in-docsVipul A M2016-07-161-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Update references generation docs to exclude indexJosh Justice2016-07-161-2/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #25851 from y-yagi/add_missing_bracesVipul A M2016-07-151-2/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | add missing braces [ci skip]yuuji.yaginuma2016-07-161-2/+2