Merge branch 'remove-request-store' into 'master'

Remove dummy RequestStore

See merge request gitlab-org/gitaly!1007

3 files changed, 6 insertions, 13 deletions

diff --git a/changelogs/unreleased/remove-request-store.yml b/changelogs/unreleased/remove-request-store.yml
new file mode 100644
index 000000000..d4b03414a
--- /dev/null
+++ b/changelogs/unreleased/remove-request-store.yml
@@ -0,0 +1,5 @@
+---
+title: Remove dummy RequestStore
+merge_request: 1007
+author:
+type: other
diff --git a/ruby/lib/gitlab/git.rb b/ruby/lib/gitlab/git.rb
index 6970655a2..110ac0547 100644
--- a/ruby/lib/gitlab/git.rb
+++ b/ruby/lib/gitlab/git.rb
@@ -40,12 +40,6 @@ class String
   end
 end
 
-class RequestStore
-  def self.active?
-    false
-  end
-end
-
 module Gitlab
   module Git
     # The ID of empty tree.
diff --git a/ruby/lib/gitlab/git/wiki.rb b/ruby/lib/gitlab/git/wiki.rb
index 25f47b306..132396e35 100644
--- a/ruby/lib/gitlab/git/wiki.rb
+++ b/ruby/lib/gitlab/git/wiki.rb
@@ -94,13 +94,7 @@ module Gitlab
       end
 
       def version(commit_id)
-        commit_find_proc = -> { Gitlab::Git::Commit.find(@repository, commit_id) }
-
-        if RequestStore.active?
-          RequestStore.fetch([:wiki_version_commit, commit_id]) { commit_find_proc.call }
-        else
-          commit_find_proc.call
-        end
+        Gitlab::Git::Commit.find(@repository, commit_id)
       end
 
       def assert_type!(object, klass)