Skip to content
GitLab
Next
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
Fix conflicts ce-to-ee prep branch
Code
Review changes
Check out branch
Download
Patches
Plain diff
Filipa Lacerda
requested to merge
10-8-stable-ee-patch-1-ee-conflicts
into
10-8-stable-ee-patch-1
May 23, 2018
Overview
4
Commits
21
Pipelines
2
Changes
35
Expand
Fix conflicts ce-to-ee prep branch:
@yorickpeterse
app/controllers/admin/dashboard_controller.rb
@yorickpeterse
app/views/admin/dashboard/index.html.haml
Edited
May 23, 2018
by
Yorick Peterse
Merge request reports