Commit fb20758f authored by Yorick Peterse's avatar Yorick Peterse

Merge branch '20129-update-version_sorter-gem-to-optimize-tag-sorting' into 'master'

Update version_sorter and use new interface for faster tag sorting

See merge request !5723
parents 37005ed8 6af4efea
...@@ -34,6 +34,7 @@ v 8.11.0 (unreleased) ...@@ -34,6 +34,7 @@ v 8.11.0 (unreleased)
- Retrieve rendered HTML from cache in one request - Retrieve rendered HTML from cache in one request
- Fix renaming repository when name contains invalid chararacters under project settings - Fix renaming repository when name contains invalid chararacters under project settings
- Fix devise deprecation warnings. - Fix devise deprecation warnings.
- Update version_sorter and use new interface for faster tag sorting
- Optimize checking if a user has read access to a list of issues !5370 - Optimize checking if a user has read access to a list of issues !5370
- Nokogiri's various parsing methods are now instrumented - Nokogiri's various parsing methods are now instrumented
- Add simple identifier to public SSH keys (muteor) - Add simple identifier to public SSH keys (muteor)
......
...@@ -154,7 +154,7 @@ gem 'settingslogic', '~> 2.0.9' ...@@ -154,7 +154,7 @@ gem 'settingslogic', '~> 2.0.9'
# Misc # Misc
gem 'version_sorter', '~> 2.0.0' gem 'version_sorter', '~> 2.1.0'
# Cache # Cache
gem 'redis-rails', '~> 4.0.0' gem 'redis-rails', '~> 4.0.0'
......
...@@ -778,7 +778,7 @@ GEM ...@@ -778,7 +778,7 @@ GEM
uniform_notifier (1.10.0) uniform_notifier (1.10.0)
uuid (2.3.8) uuid (2.3.8)
macaddr (~> 1.0) macaddr (~> 1.0)
version_sorter (2.0.0) version_sorter (2.1.0)
virtus (1.0.5) virtus (1.0.5)
axiom-types (~> 0.1) axiom-types (~> 0.1)
coercible (~> 1.0) coercible (~> 1.0)
...@@ -989,7 +989,7 @@ DEPENDENCIES ...@@ -989,7 +989,7 @@ DEPENDENCIES
unf (~> 0.1.4) unf (~> 0.1.4)
unicorn (~> 4.9.0) unicorn (~> 4.9.0)
unicorn-worker-killer (~> 0.4.2) unicorn-worker-killer (~> 0.4.2)
version_sorter (~> 2.0.0) version_sorter (~> 2.1.0)
virtus (~> 1.0.1) virtus (~> 1.0.1)
vmstat (~> 2.1.1) vmstat (~> 2.1.1)
web-console (~> 2.0) web-console (~> 2.0)
......
...@@ -636,9 +636,7 @@ class Repository ...@@ -636,9 +636,7 @@ class Repository
def tags_sorted_by(value) def tags_sorted_by(value)
case value case value
when 'name' when 'name'
# Would be better to use `sort_by` but `version_sorter` only exposes VersionSorter.rsort(tags) { |tag| tag.name }
# `sort` and `rsort`
VersionSorter.rsort(tag_names).map { |tag_name| find_tag(tag_name) }
when 'updated_desc' when 'updated_desc'
tags_sorted_by_committed_date.reverse tags_sorted_by_committed_date.reverse
when 'updated_asc' when 'updated_asc'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment