Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-28 06:09:53 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-28 06:09:53 +0300
commit2e4d8b3449e8c2c750a816b9566c61a0a96b934b (patch)
tree831b4d55a3b283e519a4c911e444564d4c7c3344 /changelogs
parent56df7f06f1e57d66efcff5d8ad0026252cc91192 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/sh-update-grape-gem.yml5
-rw-r--r--changelogs/unreleased/sh-update-nokogiri-1-10-9.yml5
2 files changed, 5 insertions, 5 deletions
diff --git a/changelogs/unreleased/sh-update-grape-gem.yml b/changelogs/unreleased/sh-update-grape-gem.yml
deleted file mode 100644
index 4aec45c9429..00000000000
--- a/changelogs/unreleased/sh-update-grape-gem.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Upgrade Grape v1.1.0 to v1.3.2
-merge_request: 27276
-author:
-type: other
diff --git a/changelogs/unreleased/sh-update-nokogiri-1-10-9.yml b/changelogs/unreleased/sh-update-nokogiri-1-10-9.yml
new file mode 100644
index 00000000000..127742872d2
--- /dev/null
+++ b/changelogs/unreleased/sh-update-nokogiri-1-10-9.yml
@@ -0,0 +1,5 @@
+---
+title: Upgrade Nokogiri to v1.10.9
+merge_request: 30435
+author:
+type: other