diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-02-22 09:11:21 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-02-22 09:11:21 +0000 |
| commit | 321e26f34d7a13594dd5e63734bcb6577e389925 (patch) | |
| tree | 2b319de5e5df472f2f6c3fd90c50c1e9816377ef | |
| parent | 21924bc770e78175118619a4bd326382cb3882cc (diff) | |
| parent | fc7720dba47d0c38755d1b62c07484b1810339ef (diff) | |
| download | gitlab-ce-321e26f34d7a13594dd5e63734bcb6577e389925.tar.gz | |
Merge branch 'dz-bump-version-sorter' into 'master'
Bump version_sorter to version 2.2.4
See merge request gitlab-org/gitlab-ce!25487
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -184,7 +184,7 @@ gem 're2', '~> 1.1.1' # Misc -gem 'version_sorter', '~> 2.1.0' +gem 'version_sorter', '~> 2.2.4' # Export Ruby Regex to Javascript gem 'js_regex', '~> 3.1' diff --git a/Gemfile.lock b/Gemfile.lock index 243a5209ad6..841f85dc7e5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -916,7 +916,7 @@ GEM validates_hostname (1.0.6) activerecord (>= 3.0) activesupport (>= 3.0) - version_sorter (2.1.0) + version_sorter (2.2.4) virtus (1.0.5) axiom-types (~> 0.1) coercible (~> 1.0) @@ -1172,7 +1172,7 @@ DEPENDENCIES unicorn (~> 5.4.1) unicorn-worker-killer (~> 0.4.4) validates_hostname (~> 1.0.6) - version_sorter (~> 2.1.0) + version_sorter (~> 2.2.4) virtus (~> 1.0.1) vmstat (~> 2.3.0) webmock (~> 3.5.1) |