diff options
author | Robert Speicher <robert@gitlab.com> | 2017-03-28 23:12:23 +0300 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-03-28 23:12:23 +0300 |
commit | c82ddfe24a1a14596caf2f9ca4a6fdb521942f1c (patch) | |
tree | b51b3dd3cd332bf3e32ea84e0d588c4f2cce53d3 | |
parent | 47aeacd7f5b214d24dcb02bf0a42774415f5083d (diff) | |
parent | 91e150266adeeaa60c8626a3dd1ddc467347744f (diff) |
Merge branch 'glensc/gitlab-ce-17325-rugged-gem-update' into 'master'
Update rugged to 0.25.1.1
Closes #17325, #14972, and #14765
See merge request !10286
-rw-r--r-- | Gemfile | 4 | ||||
-rw-r--r-- | Gemfile.lock | 10 | ||||
-rw-r--r-- | changelogs/unreleased/17325-rugged-gem-update.yml | 4 | ||||
-rw-r--r-- | lib/gitlab/git/repository.rb | 23 |
4 files changed, 14 insertions, 27 deletions
@@ -15,7 +15,7 @@ gem 'default_value_for', '~> 3.0.0' gem 'mysql2', '~> 0.3.16', group: :mysql gem 'pg', '~> 0.18.2', group: :postgres -gem 'rugged', '~> 0.24.0' +gem 'rugged', '~> 0.25.1.1' # Authentication libraries gem 'devise', '~> 4.2' @@ -63,7 +63,7 @@ gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: 'omniauth-ldap' # Git Wiki # Required manually in config/initializers/gollum.rb to control load order gem 'gollum-lib', '~> 4.2', require: false -gem 'gollum-rugged_adapter', '~> 0.4.2', require: false +gem 'gollum-rugged_adapter', '~> 0.4.4', require: false # Language detection gem 'github-linguist', '~> 4.7.0', require: 'linguist' diff --git a/Gemfile.lock b/Gemfile.lock index 2cb0e88962a..8382de2b7a0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -288,9 +288,9 @@ GEM rouge (~> 2.0) sanitize (~> 2.1.0) stringex (~> 2.5.1) - gollum-rugged_adapter (0.4.2) + gollum-rugged_adapter (0.4.4) mime-types (>= 1.15) - rugged (~> 0.24.0, >= 0.21.3) + rugged (~> 0.25) gon (6.1.0) actionpack (>= 3.0) json @@ -682,7 +682,7 @@ GEM rubypants (0.2.0) rubyzip (1.2.1) rufus-scheduler (3.1.10) - rugged (0.24.0) + rugged (0.25.1.1) safe_yaml (1.0.4) sanitize (2.1.0) nokogiri (>= 1.4.4) @@ -905,7 +905,7 @@ DEPENDENCIES gitlab-markup (~> 1.5.1) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.2) - gollum-rugged_adapter (~> 0.4.2) + gollum-rugged_adapter (~> 0.4.4) gon (~> 6.1.0) google-api-client (~> 0.8.6) grape (~> 0.19.0) @@ -987,7 +987,7 @@ DEPENDENCIES rubocop-rspec (~> 1.12.0) ruby-fogbugz (~> 0.2.1) ruby-prof (~> 0.16.2) - rugged (~> 0.24.0) + rugged (~> 0.25.1.1) sanitize (~> 2.0) sass-rails (~> 5.0.6) scss_lint (~> 0.47.0) diff --git a/changelogs/unreleased/17325-rugged-gem-update.yml b/changelogs/unreleased/17325-rugged-gem-update.yml new file mode 100644 index 00000000000..7ca619439c4 --- /dev/null +++ b/changelogs/unreleased/17325-rugged-gem-update.yml @@ -0,0 +1,4 @@ +--- +title: Update rugged to 0.25.1.1 +merge_request: 10286 +author: Elan Ruusamäe diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index 2187dd70ff4..057f7748c3e 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -320,7 +320,7 @@ module Gitlab def log_by_walk(sha, options) walk_options = { show: sha, - sort: Rugged::SORT_DATE, + sort: Rugged::SORT_NONE, limit: options[:limit], offset: options[:offset] } @@ -382,7 +382,7 @@ module Gitlab # a detailed list of valid arguments. def commits_between(from, to) walker = Rugged::Walker.new(rugged) - walker.sorting(Rugged::SORT_DATE | Rugged::SORT_REVERSE) + walker.sorting(Rugged::SORT_NONE | Rugged::SORT_REVERSE) sha_from = sha_from_ref(from) sha_to = sha_from_ref(to) @@ -460,7 +460,7 @@ module Gitlab if actual_options[:order] == :topo walker.sorting(Rugged::SORT_TOPO) else - walker.sorting(Rugged::SORT_DATE) + walker.sorting(Rugged::SORT_NONE) end commits = [] @@ -828,23 +828,6 @@ module Gitlab Rugged::Commit.create(rugged, actual_options) end - def commits_since(from_date) - walker = Rugged::Walker.new(rugged) - walker.sorting(Rugged::SORT_DATE | Rugged::SORT_REVERSE) - - rugged.references.each("refs/heads/*") do |ref| - walker.push(ref.target_id) - end - - commits = [] - walker.each do |commit| - break if commit.author[:time].to_date < from_date - commits.push(commit) - end - - commits - end - AUTOCRLF_VALUES = { "true" => true, "false" => false, |