aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Cleanup credits related code as it is removed now in PR #32429Prathamesh Sonpatki2018-04-032-10/+1
|/ / / /
* | | | Merge pull request #32429 from yhirano55/remove_credits_html_from_rails_guidesKasper Timm Hansen2018-04-036-89/+1
|\ \ \ \
| * | | | Remove credits.html from Rails GuidesYoshiyuki Hirano2018-04-036-89/+1
* | | | | Merge pull request #32430 from yhirano55/display_db_drop_desc_in_activerecordRyuta Kamizono2018-04-031-1/+3
|\ \ \ \ \
| * | | | | Display db:drop description in ActiveRecordYoshiyuki Hirano2018-04-031-1/+3
| |/ / / /
* | | | | Merge pull request #32427 from tjschuck/small_doc_fixesRyuta Kamizono2018-04-034-7/+7
|\ \ \ \ \
| * | | | | Small doc fixesT.J. Schuck2018-04-024-7/+7
| |/ / / /
* | | | | Merge pull request #32428 from EarthSchlange/patch-1Ryuta Kamizono2018-04-031-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Doc fix added missing quoteMichael H2018-04-021-1/+1
|/ / / /
* | | | Merge pull request #32418 from urbanautomaton/disable-template-finalizer-in-testRafael França2018-04-025-1/+33
|\ \ \ \
| * | | | Add `action_view.finalize_compiled_template_methods` config optionSimon Coffey2018-04-025-1/+33
|/ / / /
* | | | Merge pull request #32336 from vincedevendra/allow_mutating_dig_return_valueAaron Patterson2018-04-022-1/+10
|\ \ \ \
| * | | | Make mutating params#dig mutate underlying paramsVince DeVendra2018-03-242-1/+10
* | | | | Merge pull request #32404 from mathieumahe/masterGuillermo Iguaran2018-04-023-1/+39
|\ \ \ \ \
| * | | | | Extract the confirm call in its own, overridable method in rails_ujsMathieu2018-04-013-1/+39
* | | | | | Merge pull request #32415 from kamipo/remove_foreign_keys_moduleGuillermo Iguaran2018-04-024-15/+2
|\ \ \ \ \ \
| * | | | | | Remove `ForeignKeys` module which was introduced at #32299Ryuta Kamizono2018-04-024-15/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #32416 from yhirano55/not_generate_needless_files_in_guidesRafael França2018-04-021-25/+27
|\ \ \ \ \ \
| * | | | | | Not generate needless files in guidesYoshiyuki Hirano2018-04-021-25/+27
* | | | | | | [ci skip] Fully quantify Active Record module in changelog.Kasper Timm Hansen2018-04-021-1/+1
* | | | | | | Merge pull request #32417 from bogdan/base-classKasper Timm Hansen2018-04-028-9/+27
|\ \ \ \ \ \ \
| * | | | | | | Add AR::Base.base_class? predicateBogdan Gusiev2018-04-028-9/+27
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #32065 from sikachu/move-SourceAnnotationExtractor-under-r...Kasper Timm Hansen2018-04-026-130/+137
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Run `bundle update` on bootsnapPrem Sichanugrist2018-03-231-7/+5
| * | | | | | Add deprecation note for SourceAnnotationExtractorPrem Sichanugrist2018-03-221-0/+7
| * | | | | | Make Annotation into a proper classPrem Sichanugrist2018-03-221-1/+1
| * | | | | | Move SourceAnnotationExtractor under Rails modulePrem Sichanugrist2018-03-225-123/+125
* | | | | | | Merge pull request #32407 from razh/fix-rails-ujs-html-content-testYuji Yaginuma2018-04-021-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix typo in rails-ujs HTML content testRaymond Zhou2018-04-011-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #32406 from olivierlacan/actionview-helpers-docs-consisten...Kasper Timm Hansen2018-04-014-23/+23
|\ \ \ \ \ \ \
| * | | | | | | Use consistent spacing in actionview helper docs [ci skip]Olivier Lacan2018-04-014-23/+23
* | | | | | | | Merge pull request #32287 from razh/fix-rails-ujs-html-contentKasper Timm Hansen2018-04-012-1/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Pass HTML responses as plain-text in rails-ujsRaymond Zhou2018-03-192-1/+12
* | | | | | | | Merge pull request #32268 from freeletics/encrypted-tmp-file-nameKasper Timm Hansen2018-04-011-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Change temporary file name extension while editing encrypted file.Wojciech Wnętrzak2018-03-181-1/+1
* | | | | | | | Merge pull request #32400 from utilum/cleanup_after_sqlite3_connection_handle...Andrew White2018-04-011-0/+2
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Remove leftover blank sqlite3 file after in memory handler tests.utilum2018-04-011-0/+2
|/ / / / / / /
* | | | | | | Merge pull request #32398 from bogdanvlviv/32185-dry-in-before-after-mehtods-...Ryuta Kamizono2018-04-018-42/+22
|\ \ \ \ \ \ \
| * | | | | | | Move implementation of `before?` and `after?` to `DateAndTime::Calculations`bogdanvlviv2018-03-318-42/+22
* | | | | | | | Merge pull request #32396 from eugeneius/database_configurations_urlEileen M. Uchitelle2018-03-312-11/+53
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix two-level database configurations with URLsEugene Kenny2018-03-312-11/+53
* | | | | | | | | Merge pull request #32397 from yhirano55/remove_needless_images_in_guidesXavier Noria2018-03-3141-15/+10
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Remove needless images in guidesYoshiyuki Hirano2018-03-3128-5/+0
| * | | | | | | | Put images into each page's dir in guidesYoshiyuki Hirano2018-03-3113-10/+10
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #32394 from yskkin/key_generatorAndrew White2018-03-312-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Deriving `secret_key_base` breaks `key_generator` defined in 5.1.Yoshiyuki Kinjo2018-03-312-1/+2
* | | | | | | | | Merge pull request #32395 from yhirano55/use_oxford_comma_style_in_guideAndrew White2018-03-311-1/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | [ci skip] Use Oxford comma style in guideYoshiyuki Hirano2018-03-311-1/+1
* | | | | | | | | Merge pull request #32386 from utilum/tmpname_basenameAndrew White2018-03-311-1/+3
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Fix: FileStoreTest#test_filename_max_size fails in Ruby 2.5.1utilum2018-03-311-1/+3
|/ / / / / / / /