aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Deliver parameterized mail with DeliveryJobGannon McGibbon2018-11-229-51/+50
* | | | Merge pull request #34455 from minimalweb/progressive_jpeg_inclusion_as_varia...Rafael França2018-11-233-1/+6
|\ \ \ \
| * | | | Add progressive JPG to default variable content typesMaurice Kühlborn2018-11-213-1/+6
* | | | | Merge pull request #34468 from gmcgibbon/redact_sql_in_errorsRafael França2018-11-239-58/+112
|\ \ \ \ \
| * | | | | Redact SQL in errorsGannon McGibbon2018-11-229-58/+112
* | | | | | Keep executions for each specific exception (#34352)Alberto Almagro2018-11-235-4/+51
* | | | | | Merge pull request #34507 from albertoalmagro/rename-rtl-as-directionGannon McGibbon2018-11-232-18/+21
|\ \ \ \ \ \
| * | | | | | Use direction instead of rtl flag.Alberto Almagro2018-11-222-18/+21
* | | | | | | Merge pull request #34511 from TomSpencerLondon/masterGannon McGibbon2018-11-231-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Add ? for Whats RailsTomSpencerLondon2018-11-231-1/+1
|/ / / / / /
* | | | | | Merge pull request #34037 from reitermarkus/atomic_write-permissionsRafael França2018-11-222-1/+15
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Ensure correct permission when `tmpdir` is the same as `dirname`.Markus Reiter2018-10-022-1/+15
* | | | | | Use squiggly heredoc to strip odd indentation in the executed SQLRyuta Kamizono2018-11-2219-91/+81
* | | | | | Compile packs before run testyuuji.yaginuma2018-11-221-1/+4
* | | | | | Fix ruby warningsyuuji.yaginuma2018-11-221-2/+2
| |/ / / / |/| | | |
* | | | | Merge pull request #34339 from Edouard-chin/ec-mail-test-helperRafael França2018-11-217-9/+171
|\ \ \ \ \
| * | | | | Fix ActionMailer assertion not working for mail defining delivery_job:Edouard CHIN2018-11-213-5/+70
| * | | | | Allow all ActiveJob assertion helper to accept Proc in their `only` kw:Edouard CHIN2018-11-214-4/+101
|/ / / / /
* | | | | Merge pull request #34498 from ThomBian/thombian/fix-opclass-parsingRyuta Kamizono2018-11-222-1/+13
|\ \ \ \ \
| * | | | | Fixing an issue when parsing an opclass by allowing indexed columnThomas Bianchini2018-11-212-1/+13
|/ / / / /
* | | | | Merge pull request #34491 from rails/fix-query-cache-on-multiple-connectionsEileen M. Uchitelle2018-11-212-4/+27
|\ \ \ \ \
| * | | | | Fix query cache for multiple connectionsEileen Uchitelle2018-11-202-4/+27
* | | | | | Remove odd spaces [ci skip]Ryuta Kamizono2018-11-211-2/+2
* | | | | | Merge pull request #34489 from 6temes/add_slice_method_to_errorsRafael França2018-11-213-0/+39
|\ \ \ \ \ \
| * | | | | | Add slice! method to ActiveModel::ErrorsDaniel Lopez Prat2018-11-213-0/+39
* | | | | | | Merge pull request #34497 from 6temes/make_documentation_for_slice_more_explicitRafael França2018-11-201-2/+3
|\ \ \ \ \ \ \
| * | | | | | | Improve documentation for Hash#slice!Daniel Lopez 👾2018-11-211-2/+3
| |/ / / / / /
* | | | | | | Merge pull request #34495 from rails/make-connection-handler-per-thread-not-p...Eileen M. Uchitelle2018-11-202-2/+39
|\ \ \ \ \ \ \
| * | | | | | | Make connection handler per thread instead of per fiberEileen Uchitelle2018-11-202-2/+39
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #34494 from gmcgibbon/warn_root_conflictRafael França2018-11-203-7/+22
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Raise an error on root route naming conflicts.Gannon McGibbon2018-11-203-7/+22
|/ / / / / /
* | | | | | Merge pull request #33954 from febeling/inconsistent-assignment-has-many-thro...Aaron Patterson2018-11-204-3/+43
|\ \ \ \ \ \
| * | | | | | Optimize difference and intersectionFlorian Ebeling2018-11-061-17/+9
| * | | | | | Rename union to intersectionFlorian Ebeling2018-11-063-3/+3
| * | | | | | Fix handling of duplicates for `replace` on has_many-throughFlorian Ebeling2018-11-064-3/+51
* | | | | | | Merge pull request #34492 from alfonsojimenez/fix-typoVipul A M2018-11-201-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix typo in development_dependencies_install.md [ci skip]Alfonso Jiménez2018-11-201-1/+1
|/ / / / / / /
* | | | | | | Deprecate `event.end = Time.now` in favor of `event.finish!`Ryuta Kamizono2018-11-201-2/+6
* | | | | | | Merge pull request #22534 from evopark/masterRafael Mendonça França2018-11-194-3/+26
|\ \ \ \ \ \ \
| * | | | | | | ActionMailer: support overriding template name in multipartMarcus Ilgner2015-12-084-3/+26
* | | | | | | | Merge pull request #20865 from colavitam/only-except-behaviorRafael Mendonça França2018-11-192-2/+30
|\ \ \ \ \ \ \ \
| * | | | | | | | :only and :except are now chained for routing resource(s)Michael Colavita2015-07-133-3/+40
* | | | | | | | | Merge pull request #34488 from mullican/word_wrap_preserve_left_side_whitespaceRafael França2018-11-193-1/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Prevent TextHelper#word_wrap from stripping white space on the leftLyle Mullican2018-11-193-1/+23
* | | | | | | | | | Merge pull request #34085 from albertoalmagro/display-help-as-command-line-gu...Rafael França2018-11-192-34/+35
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Homogenize rails help outputAlberto Almagro2018-11-191-9/+10
| * | | | | | | | | | Indent guides as rails help command output[ci skip]Alberto Almagro2018-11-191-25/+25
* | | | | | | | | | | Merge pull request #34106 from berniechiu/rails-5-job-serializable-params-classRafael Mendonça França2018-11-193-3/+34
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Permit ActionController::Parameters for serializable HashBernie Chiu2018-11-193-3/+34
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #34482 from jacobherrington/chore/add-comments-to-templatesRafael França2018-11-192-9/+8
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |