Merge branch 'dz-bump-version-sorter' into 'master'
Bump version_sorter to version 2.2.4 See merge request gitlab-org/gitlab-ce!25487
This commit is contained in:
commit
321e26f34d
2
Gemfile
2
Gemfile
|
@ -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'
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue