Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #36777 from Edouard-chin/ec-git-pretty-credentials | Rafael França | 2019-07-26 | 4 | -9/+185 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Prettify diff generated by git for encripted file: | Edouard CHIN | 2019-07-26 | 4 | -9/+185 | |
* | | | | | | | Merge pull request #36779 from Shopify/optimize-url-helper-creation | Rafael França | 2019-07-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Optimize Journey::Route#glob? | Jean Boussier | 2019-07-26 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #36776 from giraffate/fix_join_middle_table_alias_when_usi... | Rafael França | 2019-07-26 | 2 | -3/+10 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix join middle table alias when using HABTM | Takayuki Nakata | 2019-07-26 | 2 | -3/+10 | |
* | | | | | | | | | Merge pull request #36764 from willianveiga/feature/inputs-inside-disabled-fi... | Rafael França | 2019-07-26 | 2 | -0/+19 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Add test for submitted fields within disabled fieldsets | Willian Gustavo Veiga | 2019-07-26 | 1 | -0/+18 | |
| * | | | | | | | | | Issue #36728 - Inputs inside disabled fieldset are not submited on remote: tr... | Willian Gustavo Veiga | 2019-07-25 | 1 | -0/+1 | |
* | | | | | | | | | | Merge pull request #36213 from st0012/fix-25842 | Rafael França | 2019-07-26 | 5 | -7/+60 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Add `Vary: Accept` header when rendering | st0012 | 2019-07-26 | 5 | -7/+60 | |
| | |_|_|/ / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #35992 from jduff/include_bcc | Rafael França | 2019-07-26 | 4 | -1/+39 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix Bcc header missing with emails from conductor and test helpers | John Duff | 2019-07-26 | 4 | -1/+39 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #36778 from abhaynikam/remove-unwanted-javascript-compile-... | Rafael França | 2019-07-26 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Removed webpacker:compile step from scaffold test as it is not required and a... | Abhay Nikam | 2019-07-26 | 1 | -2/+0 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #36372 from instructure-bridge/6-0-stable | Rafael França | 2019-07-26 | 2 | -8/+21 | |
* | | | | | | | | | Merge pull request #36771 from ajn123/add-documentation-for-csrf-javascript | Rafael França | 2019-07-26 | 1 | -0/+18 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | [ci skip] add CSRF token explanation for javascript documentation | ajn123 | 2019-07-26 | 1 | -0/+18 | |
* | | | | | | | | | | Merge pull request #36772 from sharang-d/default-for-digest | Rafael França | 2019-07-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Add a default value for arg `format` in `ActionView::Digestor.digest()` | Sharang Dashputre | 2019-07-26 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #36300 from okuramasafumi/make-handle-options-private | Rafael França | 2019-07-26 | 1 | -22/+22 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Make `handle_options` method private | OKURA Masafumi | 2019-05-18 | 1 | -22/+22 | |
* | | | | | | | | | | Merge pull request #35334 from sharang-d/digest-doc-update | Rafael França | 2019-07-26 | 1 | -3/+4 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Update comment for ActionView::Digestor.digest [ci skip] | Sharang Dashputre | 2019-04-16 | 1 | -3/+4 | |
* | | | | | | | | | | | Merge pull request #36180 from jonathanhefner/optimize-string-from | Rafael França | 2019-07-25 | 1 | -2/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Avoid extra allocation in String#from and #to | Jonathan Hefner | 2019-05-05 | 1 | -2/+3 | |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Use correct variable in `secure_compare!` | yuuji.yaginuma | 2019-07-26 | 2 | -1/+14 | |
* | | | | | | | | | | | Merge pull request #36005 from shioyama/plain_matcher_first | Rafael França | 2019-07-25 | 1 | -9/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Remove plain method | Chris Salzberg | 2019-05-31 | 1 | -4/+0 | |
| * | | | | | | | | | | Make plain matcher match first, not last | Chris Salzberg | 2019-05-31 | 1 | -5/+1 | |
* | | | | | | | | | | | Merge pull request #36504 from mtsmfm/mtsmfm/fix-flaky-render-test | Rafael França | 2019-07-25 | 1 | -4/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Fix flaky test ActionControllerBaseRenderTest#test_direct_render_to_string | Fumiaki MATSUSHIMA | 2019-07-26 | 1 | -4/+20 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Correct assertion argument order | George Claghorn | 2019-07-25 | 1 | -2/+1 | |
* | | | | | | | | | | | Merge pull request #36576 from mtsmfm/mtsmfm/fix-fixture-resolver | Rafael Mendonça França | 2019-07-25 | 2 | -13/+47 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Support :any variants for FixtureResolver | Fumiaki MATSUSHIMA | 2019-06-30 | 2 | -13/+47 | |
* | | | | | | | | | | | | Merge pull request #36767 from vlado/active_job_test_helper_can_now_handle_re... | Rafael França | 2019-07-25 | 3 | -1/+23 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Ability to test activejobs with relative delay | Vlado Cingel | 2019-07-26 | 3 | -1/+23 | |
* | | | | | | | | | | | | | Merge pull request #36765 from kylekeesling/patch-1 | Rafael França | 2019-07-25 | 2 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Fix filenames of attachments created via the inbound email conductor | Kyle Keesling | 2019-07-25 | 2 | -1/+3 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge pull request #36747 from y-yagi/add_mention_about_collection_cache_vers... | y-yagi | 2019-07-26 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Add mention about `active_record.collection_cache_versioning` to the `new_fra... | yuuji.yaginuma | 2019-07-24 | 1 | -0/+5 | |
* | | | | | | | | | | | | | | Merge pull request #36770 from seejohnrun/database-env-current-env-only | Eileen M. Uchitelle | 2019-07-25 | 2 | -18/+36 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Only merge DATABASE_URL settings into the current env | John Crepezzi | 2019-07-25 | 2 | -18/+36 | |
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge pull request #36731 from jhawthorn/dir_glob_base_instead_of_chdir | John Hawthorn | 2019-07-25 | 1 | -6/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Use Dir.glob(base: ...) to avoid chdir | John Hawthorn | 2019-07-22 | 1 | -6/+4 | |
* | | | | | | | | | | | | | | Merge pull request #36766 from jhawthorn/call_connection_error_number | John Hawthorn | 2019-07-25 | 2 | -4/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Use connection.error_number in MySQLDatabaseTasks | John Hawthorn | 2019-07-25 | 2 | -4/+9 | |
* | | | | | | | | | | | | | | | Fixup 64a430129f | Kasper Timm Hansen | 2019-07-25 | 1 | -3/+5 | |
* | | | | | | | | | | | | | | | Use binding.local_variable_get for `:for` | Kasper Timm Hansen | 2019-07-25 | 1 | -5/+3 | |
* | | | | | | | | | | | | | | | Merge pull request #36380 from edudepetris/ed/36272-better-negative-scope-war... | Rafael Mendonça França | 2019-07-25 | 3 | -0/+39 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |