-
Rémy Coutable authored
CE to EE for 8.10.0-rc1 Unresolved conflicts: - `app/views/projects/_home_panel.html.haml` - `app/views/shared/_clone_panel.html.haml` - `app/helpers/projects_helper.rb` @iamphill Could you please resolve the conflicts introduced by gitlab-org/gitlab-ce!4989 in `app/views/projects/_home_panel.html.haml` and check that project headers look good? Thanks in advance! @patricio Could you please resolve the conflicts introduced by gitlab-org/gitlab-ce!4696 in `app/helpers/projects_helper.rb` and `app/views/shared/_clone_panel.html.haml`? Thanks in advance! I need this to be able to release 8.10.0-rc1! See merge request !528
bc1a911e