diff options
| author | ThibG <thib@sitedethib.com> | 2019-02-28 22:02:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-28 22:02:36 +0100 |
| commit | b969b150e8f095dc91c19c7381923c2c19edb968 (patch) | |
| tree | 015d70b4b633fadf70cab9d0a0b0fbd55e6456ae /Gemfile.lock | |
| parent | 76ed481aa7b67d624675cdaa85bac583853fd24d (diff) | |
| parent | 2267eee356a3d2b8ebb20892c5182b6f8169403e (diff) | |
Merge pull request #932 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 1c76025a4..2e1cfd158 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -126,7 +126,7 @@ GEM sshkit (~> 1.3) capistrano-yarn (2.0.2) capistrano (~> 3.0) - capybara (3.13.2) + capybara (3.14.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -243,7 +243,7 @@ GEM temple (>= 0.8.0) thor tilt - hamlit-rails (0.2.1) + hamlit-rails (0.2.2) actionpack (>= 4.0.1) activesupport (>= 4.0.1) hamlit (>= 1.2.0) @@ -673,7 +673,7 @@ DEPENDENCIES capistrano-rails (~> 1.4) capistrano-rbenv (~> 2.1) capistrano-yarn (~> 2.0) - capybara (~> 3.13) + capybara (~> 3.14) charlock_holmes (~> 0.7.6) chewy (~> 5.0) cld3 (~> 3.2.3) |