Commit 80cd8f3e authored by Stan Hu's avatar Stan Hu

Merge branch 'set-gl-protocol-on-rebase' into 'master'

Set the correct `GL_PROTOCOL` in the environment when rebasing.

@stanhu I tested the changes locally and they seem to work.

I'm not sure how to add tests for this, however.

See merge request !691
parents ed351b00 bc0f33c8
......@@ -3,6 +3,7 @@ v 8.12.0 (Unreleased)
v 8.11.3 (Unreleased)
- [ES] Add logging to indexer
- Set the correct `GL_PROTOCOL` when rebasing !691
v 8.11.2
- Additional documentation on protected branches for EE
......
......@@ -107,7 +107,7 @@ module MergeRequests
end
def git_env
{ 'GL_ID' => Gitlab::GlId.gl_id(current_user) }
{ 'GL_ID' => Gitlab::GlId.gl_id(current_user), 'GL_PROTOCOL' => 'web' }
end
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment