aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into activestorage-guideJeffrey Guenther2017-11-30172-676/+2670
|\
| * Do not overwrite by default if credentials already existsyuuji.yaginuma2017-11-302-2/+12
| * Add :nodoc: to `StatementPool` which is internal used [ci skip]Ryuta Kamizono2017-11-302-4/+2
| * Build the root folder before specific filesRafael Mendonça França2017-11-291-8/+8
| * Make screenshots default to "simple" formateileencodes2017-11-292-10/+13
| * Merge pull request #31214 from chopraanmol1/bug_fix_has_one_inverse_owner_rel...Eileen M. Uchitelle2017-11-293-0/+17
| |\
| | * Inverse instance should not be reloaded during autosave if called in validationAnmol Chopra2017-11-273-0/+17
| * | Merge pull request #31272 from y-yagi/use_credentials_instead_of_keyfile_in_gcsGeorge Claghorn2017-11-295-21/+23
| |\ \
| | * | Use `credentials` instead of `keyfile` in GCS seviceyuuji.yaginuma2017-11-295-21/+23
| * | | Mention about Ruby 2.4 Unicode case mappings in `mb_chars` example [ci skip] ...Ryuta Kamizono2017-11-291-1/+3
| * | | Fix tests: Remove ogx mime type from testsGuillermo Iguaran2017-11-291-1/+1
| * | | Fix typo in mime type registeringGuillermo Iguaran2017-11-291-1/+1
| * | | Restore mpeg mime type, delete less common mime typesGuillermo Iguaran2017-11-291-9/+4
| * | | Register "audio/mp4" mime type with :m4a symbolGuillermo Iguaran2017-11-291-1/+1
| * | | Merge pull request #31274 from dixitp012/correct_output_for_upcaseRyuta Kamizono2017-11-291-1/+1
| |\ \ \
| | * | | [ci skip] Correct output for UpcaseDixit Patel2017-11-291-1/+1
| * | | | Merge pull request #31251 from rails/preload_link_tagGuillermo Iguaran2017-11-297-8/+128
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Update send_file headers test to use mp4 as example instead of mpgGuillermo Iguaran2017-11-281-1/+1
| | * | | Register most popular audio/video/font mime types supported by modern browsersGuillermo Iguaran2017-11-283-7/+29
| | * | | Add preload_link_tag helper.Guillermo Iguaran2017-11-283-0/+98
| | |/ /
| * | | Merge pull request #31268 from tjschuck/refactor_prev_next_occurringRafael França2017-11-283-26/+32
| |\ \ \ | | |/ / | |/| |
| | * | Refactor Date/Time next_occurring and prev_occurringT.J. Schuck2017-11-283-26/+32
| * | | Merge pull request #31270 from tjschuck/deprecation_example_code_formattingYuji Yaginuma2017-11-292-2/+2
| |\ \ \ | | |/ / | |/| |
| | * | Formatting fix for example codeT.J. Schuck2017-11-282-2/+2
| |/ /
| * | Merge pull request #31179 from kinnrot/scoping-reserved-namesRafael Mendonça França2017-11-285-0/+49
| |\ \
| | * | Prevent scope named same as a ActiveRecord::Relation instance method.Chen Kinnrot2017-11-285-0/+48
| * | | Merge pull request #31254 from suginoy/update_doc_find_orderRafael França2017-11-281-3/+4
| |\ \ \
| | * | | Update docs `ActiveRecord::FinderMethods#find`suginoy2017-11-281-3/+4
| * | | | Make sure the request exist befoe trying to send early hintsRafael Mendonça França2017-11-282-2/+32
| * | | | Preparing for 5.2.0.beta2 releaseRafael Mendonça França2017-11-2827-51/+108
| * | | | Merge pull request #31264 from fatosmorina/fix_typosRafael França2017-11-2813-27/+41
| |\ \ \ \
| | * | | | Fix typos and add a few suggestionsFatos Morina2017-11-2813-27/+41
| |/ / / /
| * | | | Merge pull request #31261 from rails/fix-relative-url-root-with-optimized-url...Andrew White2017-11-283-0/+54
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix optimized url helpers when using relative url rootAndrew White2017-11-283-0/+54
| | |/ /
| * | | Merge pull request #31255 from dixitp012/update_action_controller_guideRyuta Kamizono2017-11-281-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | [ci skip] Update MVC wiki linkDixit Patel2017-11-281-1/+1
| |/ /
| * | Use same version constraint in mysql adapter and generated applicationyuuji.yaginuma2017-11-282-2/+2
| * | Merge pull request #31248 from y-yagi/fix_31245Rafael França2017-11-271-1/+1
| |\ \
| | * | Include migration files in gemyuuji.yaginuma2017-11-281-1/+1
| * | | Change how `AttributeSet::Builder` receives its defaultsSean Griffin2017-11-274-20/+21
| |/ /
| * | Drop mysql2 version less than 0.4.3 to guarantee fork safety (#31244)Ryuta Kamizono2017-11-281-1/+1
| * | Merge pull request #31243 from ignat-z/patch-1Rafael França2017-11-271-8/+6
| |\ \
| | * | [ci skip] Fix documentation for deprecation method_wrappersIgnat Zakrevsky2017-11-271-8/+6
| * | | Add releases notes to the guides indexRafael Mendonça França2017-11-271-0/+4
| * | | Preparing for 5.2.0.beta1 releaseRafael Mendonça França2017-11-2727-59/+83
| * | | Merge pull request #31242 from fgo/patch-22Rafael França2017-11-271-2/+2
| |\ \ \ | | |/ / | |/| |
| | * | Update Rails on Rack guide [ci skip]Francis Go2017-11-271-2/+2
| * | | Update yarn lockRafael Mendonça França2017-11-271-10/+0
| * | | Merge pull request #31237 from prathamesh-sonpatki/5-2-release-notesRafael França2017-11-271-0/+210
| |\ \ \
| | * | | Added CSP as major feature [ci skip]Prathamesh Sonpatki2017-11-271-0/+5