Skip to content
GitLab
Next
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
Solve conflicts templating vars
Code
Review changes
Check out branch
Download
Patches
Plain diff
Jose Ivan Vargas
requested to merge
jivanvl-solve-conflicts-templating-vars
into
13-1-stable-ee-patch-1
Jun 23, 2020
Overview
4
Commits
1
Pipelines
1
Changes
7
Expand
What does this MR do?
This fixes the conflicts for the 13.1 release of the following MR:
!34668 (merged)
Screenshots
Does this MR meet the acceptance criteria?
Conformity
[-]
Changelog entry
[-]
Documentation
(
if required
)
Code review guidelines
Merge request performance guidelines
Style guides
[-]
Database guides
[-]
Separation of EE specific content
Edited
Nov 16, 2020
by
🤖 GitLab Bot 🤖
Merge request reports
Loading