diff options
| author | Z.J. van de Weg <git@zjvandeweg.nl> | 2016-12-19 22:08:37 +0100 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2016-12-19 22:08:37 +0100 |
| commit | 5c99afcf0bb8ea3091d8155bc4d4a22534a66116 (patch) | |
| tree | b3b03cad2e4a9e0ba657d70d2833fb1a2cd17a31 /lib/api/internal.rb | |
| parent | 5d197230067edd8255b422b5970eb34bda061048 (diff) | |
| parent | 022242c30fe463d2b82c18c687088786b306415f (diff) | |
| download | gitlab-ce-5c99afcf0bb8ea3091d8155bc4d4a22534a66116.tar.gz | |
Merge branch 'master' into zj-mattermost-slash-config
Diffstat (limited to 'lib/api/internal.rb')
| -rw-r--r-- | lib/api/internal.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/api/internal.rb b/lib/api/internal.rb index 7087ce11401..db2d18f935d 100644 --- a/lib/api/internal.rb +++ b/lib/api/internal.rb @@ -32,7 +32,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]) |