summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2019-03-28 09:06:36 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2019-03-28 09:06:36 +0000
commitfd3f70c3157da3fbf15c40c48c14c3feaaadcf86 (patch)
tree2a63ac9b9fb8f7754c5e87fba2f730dd34caf3de
parentef18642b1fca7c661a8dff5ff2f86f3ff0da1f49 (diff)
parent6360ef5c5bda0ab00702e2b8e3aae966b07d27c5 (diff)
downloadgitlab-ce-fd3f70c3157da3fbf15c40c48c14c3feaaadcf86.tar.gz
Merge branch '59273-update-fugit' into 'master'
Update fugit which fixes a potential infinite loop Closes #59273 See merge request gitlab-org/gitlab-ce!26579
-rw-r--r--Gemfile.lock2
-rw-r--r--changelogs/unreleased/59273-update-fugit.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index a8f1f4c8e76..4ebcc6c81b2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -262,7 +262,7 @@ GEM
foreman (0.84.0)
thor (~> 0.19.1)
formatador (0.2.5)
- fugit (1.1.7)
+ fugit (1.1.9)
et-orbi (~> 1.1, >= 1.1.7)
raabro (~> 1.1)
fuubar (2.2.0)
diff --git a/changelogs/unreleased/59273-update-fugit.yml b/changelogs/unreleased/59273-update-fugit.yml
new file mode 100644
index 00000000000..3a1c64d87ef
--- /dev/null
+++ b/changelogs/unreleased/59273-update-fugit.yml
@@ -0,0 +1,5 @@
+---
+title: Update fugit which fixes a potential infinite loop
+merge_request: 26579
+author:
+type: fixed