diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-19 12:09:13 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-19 12:09:13 +0000 |
| commit | cd3e2c7b9355f8990ab294b34b5e4add4f3985fa (patch) | |
| tree | 77264b3e569ec95da8476f604d3d5cf4b03e85dc /changelogs | |
| parent | c1fc5da123a1fe670e32740669a9d5e59eff38f5 (diff) | |
| download | gitlab-ce-cd3e2c7b9355f8990ab294b34b5e4add4f3985fa.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/allow_toggle_modsecurity_settings.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/rk4bir-master-patch-77755.yml | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/allow_toggle_modsecurity_settings.yml b/changelogs/unreleased/allow_toggle_modsecurity_settings.yml new file mode 100644 index 00000000000..7535d00c58d --- /dev/null +++ b/changelogs/unreleased/allow_toggle_modsecurity_settings.yml @@ -0,0 +1,5 @@ +--- +title: Allow enabling/disabling modsecurity from UI +merge_request: 24747 +author: +type: added diff --git a/changelogs/unreleased/rk4bir-master-patch-77755.yml b/changelogs/unreleased/rk4bir-master-patch-77755.yml new file mode 100644 index 00000000000..b904dad6660 --- /dev/null +++ b/changelogs/unreleased/rk4bir-master-patch-77755.yml @@ -0,0 +1,5 @@ +--- +title: Migrated from .fa-spinner to .spinner in app/assets/javascripts/blob/template_selector.js +merge_request: 25045 +author: Raihan Kabir (gitlab/rk4bir) +type: changed |