CE upstream - 2018-11-29 00:21 UTC

Files to resolve:

• Cindy Pallares Please resolve (UU) app/controllers/application_controller.rb
• Cindy Pallares Please resolve (UU) app/controllers/projects/issues_controller.rb
• Cindy Pallares Please resolve (UU) app/controllers/projects_controller.rb
• Cindy Pallares Please resolve (UU) app/views/projects/commits/_commit.html.haml
• @eread Please resolve (UU) doc/README.md
• @gtsiolis Please resolve (UU) locale/gitlab.pot
• Cindy Pallares Please resolve (UU) spec/models/project_spec.rb

Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-11-29 branch.

More detailed instructions

Thanks in advance! ❤

@gtsiolis After you resolved the conflicts, please assign to the next person. If you're the last one to resolve the conflicts, please push this to be merged and do not choose to squash the commits.

Note: This merge request was created by an automated script. Please report any issue at https://gitlab.com/gitlab-org/release-tools/issues!