diff options
| author | ThibG <thib@sitedethib.com> | 2019-08-07 20:04:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-07 20:04:22 +0200 |
| commit | 86cfa2ea6cb94c9597b9fcda034c8b4d959c5e3e (patch) | |
| tree | 2e1b3be0201e53c96f05993f1295b0e97bb14166 /Gemfile | |
| parent | 8400ddca7155005ab79485ed6054c04ea3ca5667 (diff) | |
| parent | e8ad0a800616a1f95fd71ab8457869e716212ca0 (diff) | |
Merge pull request #1193 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile index 70295bc8d..43d8d2fd0 100644 --- a/Gemfile +++ b/Gemfile @@ -115,7 +115,7 @@ end group :test do gem 'capybara', '~> 3.28' gem 'climate_control', '~> 0.2' - gem 'faker', '~> 1.9' + gem 'faker', '~> 2.1' gem 'microformats', '~> 4.1' gem 'rails-controller-testing', '~> 1.0' gem 'rspec-sidekiq', '~> 3.0' |