Automatic merge of gitlab-org/gitlab-ce master

46c8d9b2 · GitLab Bot · cab0468e · 321e26f3 · 46c8d9b2 · 46c8d9b2
Commit 46c8d9b2 authored Feb 22, 2019 by GitLab Bot
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +2 -2

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -194,7 +194,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'

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -946,7 +946,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)
@@ -1211,7 +1211,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)