diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-05-17 17:12:50 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-05-17 17:12:50 +0000 |
| commit | a3795a0cff4f084fd349af6c257a3ac81163b132 (patch) | |
| tree | 89ed6255a508f4f9e402e023b8e86aa5c044e4c3 /Gemfile.lock | |
| parent | 5ec4052281da296f40d6eec90301cbf44c93f5c4 (diff) | |
| parent | ccde391648ce9aece94a3b63ccccbd7df67ce693 (diff) | |
| download | gitlab-ce-a3795a0cff4f084fd349af6c257a3ac81163b132.tar.gz | |
Merge branch 'fix-too-many-loops-cron-error' into 'master'
Rescue too many loops cron error
Closes #58241
See merge request gitlab-org/gitlab-ce!28002
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 94961354a2e..37652138436 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -192,7 +192,7 @@ GEM equalizer (0.0.11) erubi (1.8.0) escape_utils (1.2.1) - et-orbi (1.1.7) + et-orbi (1.2.1) tzinfo eventmachine (1.2.7) excon (0.62.0) @@ -266,8 +266,8 @@ GEM foreman (0.84.0) thor (~> 0.19.1) formatador (0.2.5) - fugit (1.1.9) - et-orbi (~> 1.1, >= 1.1.7) + fugit (1.2.1) + et-orbi (~> 1.1, >= 1.1.8) raabro (~> 1.1) fuubar (2.2.0) rspec-core (~> 3.0) @@ -1064,7 +1064,7 @@ DEPENDENCIES fog-rackspace (~> 0.1.1) font-awesome-rails (~> 4.7) foreman (~> 0.84.0) - fugit (~> 1.1) + fugit (~> 1.2.1) fuubar (~> 2.2.0) gemojione (~> 3.3) gettext (~> 3.2.2) |