Merge branch 'backport-7967-and-8189-to-8-13-stable' into '8-13-stable' 8-13-stable

Backport !7967 and !8189 to `8-13-stable`

See merge request !8991

1 files changed, 13 insertions, 1 deletions

diff --git a/lib/api/internal.rb b/lib/api/internal.rb
index 9a5d1ece070..89e47a7b0f5 100644
--- a/lib/api/internal.rb
+++ b/lib/api/internal.rb
@@ -43,6 +43,14 @@ module API
             :push_code
           ]
         end
+
+        def parse_allowed_environment_variables
+          return if params[:env].blank?
+
+          JSON.parse(params[:env])
+
+        rescue JSON::ParserError
+        end
       end
 
       post "/allowed" do
@@ -61,7 +69,11 @@ module API
           if wiki?
             Gitlab::GitAccessWiki.new(actor, project, protocol, authentication_abilities: ssh_authentication_abilities)
           else
-            Gitlab::GitAccess.new(actor, project, protocol, authentication_abilities: ssh_authentication_abilities)
+            Gitlab::GitAccess.new(actor,
+                                  project,
+                                  protocol,
+                                  authentication_abilities: ssh_authentication_abilities,
+                                  env: parse_allowed_environment_variables)
           end
 
         access_status = access.check(params[:action], params[:changes])