From 0f4a8403ff09f6ce28c56abc8c3b5e45a083d043 Mon Sep 17 00:00:00 2001
From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com>
Date: Mon, 16 Sep 2024 09:12:42 +0100
Subject: [PATCH] Revert "turn on duplicate log check on staging (#2635)"
 (#2639)

* Revert "turn on duplicate log check on staging (#2635)"

This reverts commit aeb998c537dc3000f9761ebe6ed11cc6a7910b66.

* Update fixed git version
---
 Dockerfile                     | 2 +-
 app/services/feature_toggle.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b26aad246..a26c80ee9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ RUN apk add --update --no-cache tzdata && \
 # build-base: compilation tools for bundle
 # yarn: node package manager
 # postgresql-dev: postgres driver and libraries
-RUN apk add --no-cache build-base=0.5-r3 busybox=1.36.1-r7 nodejs-current=20.8.1-r0 yarn=1.22.19-r0 postgresql13-dev=13.15-r0 git=2.40.1-r0 bash=5.2.15-r5
+RUN apk add --no-cache build-base=0.5-r3 busybox=1.36.1-r7 nodejs-current=20.8.1-r0 yarn=1.22.19-r0 postgresql13-dev=13.15-r0 git=2.40.3-r0 bash=5.2.15-r5
 
 # Bundler version should be the same version as what the Gemfile.lock was bundled with
 RUN gem install bundler:2.3.14 --no-document
diff --git a/app/services/feature_toggle.rb b/app/services/feature_toggle.rb
index c51b34d8b..91989ff86 100644
--- a/app/services/feature_toggle.rb
+++ b/app/services/feature_toggle.rb
@@ -4,7 +4,7 @@ class FeatureToggle
   end
 
   def self.bulk_upload_duplicate_log_check_enabled?
-    true
+    !Rails.env.staging?
   end
 
   def self.upload_enabled?