app/views/layouts/nav/sidebar/_profile.html.haml · 4c6fcb9eaee720a4edc6378bd3966ec82df7a058 · nexedi / gitlab-ce

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-21 · 4c6fcb9e

GitLab Bot authored Sep 21, 2018

# Conflicts:
#	CHANGELOG.md
#	app/views/layouts/nav/sidebar/_profile.html.haml
#	locale/gitlab.pot
#	spec/controllers/oauth/applications_controller_spec.rb

[ci skip]

4c6fcb9e

_profile.html.haml 7.9 KB

Replace _profile.html.haml