diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-11-30 17:09:39 +0000 |
|---|---|---|
| committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2016-12-01 12:17:31 -0300 |
| commit | 2953afe08f536166e88190382b3d460492324d5c (patch) | |
| tree | 39be1ee4ece7c5b0e9a5925dd1697bfd955da0b6 | |
| parent | 56b33c11ee9b2cfb1e965b508cadf6d0bdfd0cac (diff) | |
| download | gitlab-ce-2953afe08f536166e88190382b3d460492324d5c.tar.gz | |
Merge branch 'revert-rufus-scheduler-bump' into 'master'
Revert bump in rufus-scheduler
Somehow `bundle install` with an update to Sidekiq-cron in !7815 caused rufus-scheduler to be bumped, when it doesn't appear absolutely
necessary.
Closes #25160
See merge request !7844
| -rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 9a49b023c0c..3362517b3b3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -640,8 +640,7 @@ GEM rubyntlm (0.5.2) rubypants (0.2.0) rubyzip (1.2.0) - rufus-scheduler (3.3.0) - tzinfo + rufus-scheduler (3.1.10) rugged (0.24.0) safe_yaml (1.0.4) sanitize (2.1.0) |