diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-11-30 17:09:39 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-11-30 17:09:39 +0000 |
| commit | d48787a23370056770b634785a4185ed2a4fbadd (patch) | |
| tree | 53bf6b164d84ccbdd6e65e94ea9866855c03fddd | |
| parent | 77337a82f0e2ee3d600d7ece248a110cbc3ef58d (diff) | |
| parent | c347170853926a4ce0402fe1b647f578b3da620e (diff) | |
| download | gitlab-ce-d48787a23370056770b634785a4185ed2a4fbadd.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 1db0e466164..5a14ed6fede 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -614,8 +614,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) |