gitlab-triage 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 115d63f58149d8ed49f22fcafc929b06ebcf7ba180cb1047121f61a7c67d890b
-  data.tar.gz: 13f5bfcfd2bcb8325a40566fe86e30e13f03eb2aa0e3935c0f91c53446867ae2
+  metadata.gz: 0c67fa47a534d7f13d781966693423d4916292ec9924e4913492e63eb00a5f5a
+  data.tar.gz: ecd0946de096e97fd73ca3b7aa243842b3bf2cdccff9b6746b4034893789d672
 SHA512:
-  metadata.gz: ac6caff9332e7cc266ea22abb7beed863c577e4d4d4a2fb4c63171cf1834b14b1d4f0abaf616408d7a3ae9261a1668ce5e54ff6de971e14fd5136f584d7e7cd3
-  data.tar.gz: 24e71190417f5e36deca4d1b6b1ee1991eecdf7930b5af852c7b861b75dd8e50071e7c0c051c04a84f9247a9a89e4887ec016f7896823b333c5350cc1643b7ba
+  metadata.gz: cc9bc7902d7e3e96186d2f2593c76ef64bd74005857548e6b8d5014a70e3be1d75447083b06de4e7bb923651b0d9696029dfdf64ef3011672fc8a1ffbb4d8ca4
+  data.tar.gz: aa02ac6fbefebc75589e4da546c52e48150408aebdacd34fc83f0cf24a373d19c3e63de52cbfba6847bcc778b285ba21e9c4ea037d886d36122998d2bebbf9d7

data/lib/gitlab/triage/network.rb

@@ -31,11 +31,12 @@ module Gitlab
 
         begin
           print '.'
+          url = response.fetch(:next_page_url) { url }
 
           response = execute_with_retry([Net::ReadTimeout, Errors::Network::InternalServerError]) do
             puts Gitlab::Triage::UI.debug "query_api: #{url}" if options.debug
 
-            @adapter.get(token, response.fetch(:next_page_url) { url })
+            @adapter.get(token, url)
           end
 
           results = response.delete(:results)

data/lib/gitlab/triage/network_adapters/httparty_adapter.rb

@@ -22,7 +22,7 @@ module Gitlab
 
           {
             more_pages: (response.headers["x-next-page"].to_s != ""),
-            next_page_url: url + "&page=#{response.headers['x-next-page']}",
+            next_page_url: next_page_url(url, response),
             results: response.parsed_response,
             ratelimit_remaining: response.headers["ratelimit-remaining"].to_i,
             ratelimit_reset_at: Time.at(response.headers["ratelimit-reset"].to_i)
@@ -66,6 +66,18 @@ module Gitlab
 
           raise Errors::Network::InternalServerError, 'Internal server error encountered!'
         end
+
+        def next_page_url(url, response)
+          return unless response.headers['x-next-page'].present?
+
+          next_page = "&page=#{response.headers['x-next-page']}"
+
+          if url.include?('&page')
+            url.gsub(/&page=\d+/, next_page)
+          else
+            url + next_page
+          end
+        end
       end
     end
   end

data/lib/gitlab/triage/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Triage
-    VERSION = '1.7.0'.freeze
+    VERSION = '1.7.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-triage
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport