diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-04-06 11:17:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-06 11:17:52 +0200 |
| commit | df326b8b5c0659edb2aca77690a892f228b0e099 (patch) | |
| tree | 0d6b014047fa80270377b83e313aa882923c9429 /Gemfile.lock | |
| parent | 39b9a0619ab4ba68ed429152153cf0dbbfcd5a5a (diff) | |
| parent | 5c225b03db280c94dc3519dc5bad2cac86487e9b (diff) | |
Merge pull request #1519 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 9fc70e175..1d6480a7b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -22,14 +22,6 @@ GIT statsd-ruby (~> 1.4, >= 1.4.0) GIT - remote: https://github.com/ianheggie/health_check - revision: 0b799ead604f900ed50685e9b2d469cd2befba5b - ref: 0b799ead604f900ed50685e9b2d469cd2befba5b - specs: - health_check (4.0.0.pre) - rails (>= 4.0) - -GIT remote: https://github.com/nsommer/pluck_each revision: 73be0947c52fc54bf6d7085378db008358aac5eb ref: 73be0947c52fc54bf6d7085378db008358aac5eb @@ -567,7 +559,7 @@ GEM rspec-support (3.10.2) rspec_junit_formatter (0.4.1) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.12.0) + rubocop (1.12.1) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) @@ -756,7 +748,6 @@ DEPENDENCIES fog-openstack (~> 0.3) fuubar (~> 2.5) hamlit-rails (~> 0.2) - health_check! hiredis (~> 0.6) htmlentities (~> 4.3) http (~> 4.4) |