aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #36776 from giraffate/fix_join_middle_table_alias_when_usi...Rafael França2019-07-262-3/+10
|\
| * Fix join middle table alias when using HABTMTakayuki Nakata2019-07-262-3/+10
* | Merge pull request #36764 from willianveiga/feature/inputs-inside-disabled-fi...Rafael França2019-07-262-0/+19
|\ \
| * | Add test for submitted fields within disabled fieldsetsWillian Gustavo Veiga2019-07-261-0/+18
| * | Issue #36728 - Inputs inside disabled fieldset are not submited on remote: tr...Willian Gustavo Veiga2019-07-251-0/+1
* | | Merge pull request #36213 from st0012/fix-25842Rafael França2019-07-265-7/+60
|\ \ \
| * | | Add `Vary: Accept` header when renderingst00122019-07-265-7/+60
* | | | Merge pull request #35992 from jduff/include_bccRafael França2019-07-264-1/+39
|\ \ \ \
| * | | | Fix Bcc header missing with emails from conductor and test helpersJohn Duff2019-07-264-1/+39
| |/ / /
* | | | Merge pull request #36778 from abhaynikam/remove-unwanted-javascript-compile-...Rafael França2019-07-261-2/+0
|\ \ \ \
| * | | | Removed webpacker:compile step from scaffold test as it is not required and a...Abhay Nikam2019-07-261-2/+0
| |/ / /
* | | | Merge pull request #36372 from instructure-bridge/6-0-stableRafael França2019-07-262-8/+21
* | | | Merge pull request #36771 from ajn123/add-documentation-for-csrf-javascriptRafael França2019-07-261-0/+18
|\ \ \ \
| * | | | [ci skip] add CSRF token explanation for javascript documentationajn1232019-07-261-0/+18
* | | | | Merge pull request #36772 from sharang-d/default-for-digestRafael França2019-07-261-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add a default value for arg `format` in `ActionView::Digestor.digest()`Sharang Dashputre2019-07-261-1/+1
|/ / / /
* | | | Merge pull request #36300 from okuramasafumi/make-handle-options-privateRafael França2019-07-261-22/+22
|\ \ \ \
| * | | | Make `handle_options` method privateOKURA Masafumi2019-05-181-22/+22
* | | | | Merge pull request #35334 from sharang-d/digest-doc-updateRafael França2019-07-261-3/+4
|\ \ \ \ \
| * | | | | Update comment for ActionView::Digestor.digest [ci skip]Sharang Dashputre2019-04-161-3/+4
* | | | | | Merge pull request #36180 from jonathanhefner/optimize-string-fromRafael França2019-07-251-2/+3
|\ \ \ \ \ \
| * | | | | | Avoid extra allocation in String#from and #toJonathan Hefner2019-05-051-2/+3
* | | | | | | Use correct variable in `secure_compare!`yuuji.yaginuma2019-07-262-1/+14
* | | | | | | Merge pull request #36005 from shioyama/plain_matcher_firstRafael França2019-07-251-9/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Remove plain methodChris Salzberg2019-05-311-4/+0
| * | | | | | Make plain matcher match first, not lastChris Salzberg2019-05-311-5/+1
* | | | | | | Merge pull request #36504 from mtsmfm/mtsmfm/fix-flaky-render-testRafael França2019-07-251-4/+20
|\ \ \ \ \ \ \
| * | | | | | | Fix flaky test ActionControllerBaseRenderTest#test_direct_render_to_stringFumiaki MATSUSHIMA2019-07-261-4/+20
|/ / / / / / /
* | | | | | | Correct assertion argument orderGeorge Claghorn2019-07-251-2/+1
* | | | | | | Merge pull request #36576 from mtsmfm/mtsmfm/fix-fixture-resolverRafael Mendonça França2019-07-252-13/+47
|\ \ \ \ \ \ \
| * | | | | | | Support :any variants for FixtureResolverFumiaki MATSUSHIMA2019-06-302-13/+47
* | | | | | | | Merge pull request #36767 from vlado/active_job_test_helper_can_now_handle_re...Rafael França2019-07-253-1/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | Ability to test activejobs with relative delayVlado Cingel2019-07-263-1/+23
* | | | | | | | | Merge pull request #36765 from kylekeesling/patch-1Rafael França2019-07-252-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix filenames of attachments created via the inbound email conductorKyle Keesling2019-07-252-1/+3
| |/ / / / / / / /
* | | | | | | | | Merge pull request #36747 from y-yagi/add_mention_about_collection_cache_vers...y-yagi2019-07-261-0/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add mention about `active_record.collection_cache_versioning` to the `new_fra...yuuji.yaginuma2019-07-241-0/+5
* | | | | | | | | | Merge pull request #36770 from seejohnrun/database-env-current-env-onlyEileen M. Uchitelle2019-07-252-18/+36
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Only merge DATABASE_URL settings into the current envJohn Crepezzi2019-07-252-18/+36
* | | | | | | | | | | Merge pull request #36731 from jhawthorn/dir_glob_base_instead_of_chdirJohn Hawthorn2019-07-251-6/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Use Dir.glob(base: ...) to avoid chdirJohn Hawthorn2019-07-221-6/+4
* | | | | | | | | | | Merge pull request #36766 from jhawthorn/call_connection_error_numberJohn Hawthorn2019-07-252-4/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use connection.error_number in MySQLDatabaseTasksJohn Hawthorn2019-07-252-4/+9
* | | | | | | | | | | | Fixup 64a430129fKasper Timm Hansen2019-07-251-3/+5
* | | | | | | | | | | | Use binding.local_variable_get for `:for`Kasper Timm Hansen2019-07-251-5/+3
* | | | | | | | | | | | Merge pull request #36380 from edudepetris/ed/36272-better-negative-scope-war...Rafael Mendonça França2019-07-253-0/+39
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add a warning for enum elements with 'not_' prefix.Edu Depetris2019-06-303-0/+39
* | | | | | | | | | | | | let autoloaded? support modules with overridden names [closes #36757]Xavier Noria2019-07-254-3/+30
* | | | | | | | | | | | | read configuration to determine excluded eager loaded directory (#36354)Andrew Kress2019-07-252-2/+11
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #36318 from itsWill/fix_event_object_payloadRafael França2019-07-253-1/+24
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 18:02:45 +0000