Add latest changes from gitlab-org/gitlab@master

2 files changed, 41 insertions, 0 deletions

diff --git a/config/feature_flags/development/feature_flag_contextual_issue.yml b/config/feature_flags/development/feature_flag_contextual_issue.yml
new file mode 100644
index 00000000000..1889a6c871c
--- /dev/null
+++ b/config/feature_flags/development/feature_flag_contextual_issue.yml
@@ -0,0 +1,8 @@
+---
+name: feature_flag_contextual_issue
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53021
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/320741
+milestone: '13.9'
+type: development
+group: group::release
+default_enabled: false
diff --git a/config/initializers/net_http_patch.rb b/config/initializers/net_http_patch.rb
new file mode 100644
index 00000000000..a50ba7580cc
--- /dev/null
+++ b/config/initializers/net_http_patch.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+# Monkey patch Net::HTTP to fix missing URL decoding for username and password in proxy settings
+#
+# See proposed upstream fix https://github.com/ruby/net-http/pull/5
+# See Ruby-lang issue https://bugs.ruby-lang.org/issues/17542
+# See issue on GitLab https://gitlab.com/gitlab-org/gitlab/-/issues/289836
+
+module Net
+  class HTTP < Protocol
+    def proxy_user
+      if environment_variable_is_multiuser_safe? && @proxy_from_env
+        user = proxy_uri&.user
+        CGI.unescape(user) unless user.nil?
+      else
+        @proxy_user
+      end
+    end
+
+    def proxy_pass
+      if environment_variable_is_multiuser_safe? && @proxy_from_env
+        pass = proxy_uri&.password
+        CGI.unescape(pass) unless pass.nil?
+      else
+        @proxy_pass
+      end
+    end
+
+    def environment_variable_is_multiuser_safe?
+      ENVIRONMENT_VARIABLE_IS_MULTIUSER_SAFE
+    end
+  end
+end