diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-06-28 04:54:35 +0300 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2017-06-28 04:54:35 +0300 |
| commit | 8d890d71d58d37cf87c41ee6808a55a7f784e8a8 (patch) | |
| tree | a787e783f982db882206076f9971cbf8dc79329c /changelogs | |
| parent | b2dd17b2f2c0d02c18d5b413d5fefd59b4c9fed1 (diff) | |
| parent | a1f0692d682cd304f2d8b7d0f523921853409402 (diff) | |
Merge branch '9-3-stable-patch-2' into '9-3-stable'
Prepare 9.3.2
See merge request !12493
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/34282-fix-api-using-include_missing-false.yml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-fix-premailer-gem-for-filesystem.yml | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/changelogs/unreleased/34282-fix-api-using-include_missing-false.yml b/changelogs/unreleased/34282-fix-api-using-include_missing-false.yml new file mode 100644 index 00000000000..e7fff2c1a9f --- /dev/null +++ b/changelogs/unreleased/34282-fix-api-using-include_missing-false.yml @@ -0,0 +1,4 @@ +--- +title: 'API: Fix optional arugments for POST :id/variables' +merge_request: 12474 +author: diff --git a/changelogs/unreleased/sh-fix-premailer-gem-for-filesystem.yml b/changelogs/unreleased/sh-fix-premailer-gem-for-filesystem.yml new file mode 100644 index 00000000000..9e3c3e19bea --- /dev/null +++ b/changelogs/unreleased/sh-fix-premailer-gem-for-filesystem.yml @@ -0,0 +1,5 @@ +--- +title: Bump premailer-rails gem to 1.9.7 and its dependencies to prevent network retrieval + of assets +merge_request: +author: |