Skip to content

CE upstream

Valery Sizov requested to merge ce_upstream into master

Could you guys please resolve next conflicts (the conflicts just committed to the branch):

@dzaporozhets - app/views/layouts/nav/_project_settings.html.haml

@iamphill app/views/projects/_builds_settings.html.haml and app/views/projects/edit.html.haml

@annabeldunstone app/views/projects/_home_panel.html.haml

@jschatz1 - app/views/shared/issuable/_form.html.haml

  • app/views/layouts/nav/_project_settings.html.haml
  • app/views/projects/_builds_settings.html.haml
  • app/views/projects/edit.html.haml
  • app/views/projects/_home_panel.html.haml
  • app/views/shared/issuable/_form.html.haml
  • app/views/layouts/nav/_project.html.haml
  • app/views/projects/hooks/index.html.haml

Merge request reports