diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-11-13 08:39:20 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-11-13 08:39:20 +0000 |
| commit | 1818570c17c3bfc080721fa44d77c2c5647e16a5 (patch) | |
| tree | 489972b14281f77e2b68c46eb44c0430a9512010 | |
| parent | 123970182274ead330cdb93a1cb3296884b1cd69 (diff) | |
| parent | 18db027d4b3880a0543be0f0ad2718dc1044e7e2 (diff) | |
| download | gitlab-ce-1818570c17c3bfc080721fa44d77c2c5647e16a5.tar.gz | |
Merge branch '53291-update-ffaker-to-2-10-0' into 'master'
Update ffaker to 2.10.0
Closes #53291
See merge request gitlab-org/gitlab-ce!22661
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | Gemfile.rails5.lock | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/53291-update-ffaker-to-2-10-0.yml | 5 |
4 files changed, 10 insertions, 5 deletions
@@ -342,7 +342,7 @@ group :development, :test do gem 'minitest', '~> 5.7.0' # Generate Fake data - gem 'ffaker', '~> 2.4' + gem 'ffaker', '~> 2.10' gem 'capybara', '~> 2.15' gem 'capybara-screenshot', '~> 1.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index 531aefb6278..0676fad16f0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -202,7 +202,7 @@ GEM multi_json fast_blank (1.0.0) fast_gettext (1.6.0) - ffaker (2.4.0) + ffaker (2.10.0) ffi (1.9.25) flipper (0.13.0) flipper-active_record (0.13.0) @@ -977,7 +977,7 @@ DEPENDENCIES factory_bot_rails (~> 4.8.2) faraday (~> 0.12) fast_blank - ffaker (~> 2.4) + ffaker (~> 2.10) flipper (~> 0.13.0) flipper-active_record (~> 0.13.0) flipper-active_support_cache_store (~> 0.13.0) diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock index be249e59280..74eb70edb7c 100644 --- a/Gemfile.rails5.lock +++ b/Gemfile.rails5.lock @@ -205,7 +205,7 @@ GEM multi_json fast_blank (1.0.0) fast_gettext (1.6.0) - ffaker (2.4.0) + ffaker (2.10.0) ffi (1.9.25) flipper (0.13.0) flipper-active_record (0.13.0) @@ -986,7 +986,7 @@ DEPENDENCIES factory_bot_rails (~> 4.8.2) faraday (~> 0.12) fast_blank - ffaker (~> 2.4) + ffaker (~> 2.10) flipper (~> 0.13.0) flipper-active_record (~> 0.13.0) flipper-active_support_cache_store (~> 0.13.0) diff --git a/changelogs/unreleased/53291-update-ffaker-to-2-10-0.yml b/changelogs/unreleased/53291-update-ffaker-to-2-10-0.yml new file mode 100644 index 00000000000..a1b95df5e32 --- /dev/null +++ b/changelogs/unreleased/53291-update-ffaker-to-2-10-0.yml @@ -0,0 +1,5 @@ +--- +title: Update ffaker to 2.10.0 +merge_request: 22661 +author: Takuya Noguchi +type: other |