Don't use URI join
Fixing an issue where pages with multiple dropzones can trigger multiple file upload dialogs under certain conditions.
Simplify email procedure now that subscribers are on the newsletter list.
Account for the EE only situation.
Merge branch 'fix/avatar_relative_url' into 'master'

Fix Avatar and Relative URL

Fixes https://github.com/gitlabhq/gitlabhq/issues/7270

Instead of `URI::join` use a simple join with a slash. This is how all other places in GitLab join URLs and it doesn't muck with the relative path.

See merge request !144
Merge branch 'file-upload-bugfix' into 'master'

Bugfix for Multiple File Upload Dialogs

Fixes issue #426, where a page with multiple dropzones can accidentally trigger multiple file upload dialogs when the user clicks the "selecting them" link.

By specifying the closest "div-dropzone-wrapper" before sending a click to "div-dropzone", duplicate events are prevented from firing.

See merge request !153
Move signup_enabled and signin_enabled back

This partially reverts b5543be19dc4e6c546e5f by restoring the nesting
for the signup_enabled and signin_enabled attributes.
Merge branch 'patch-email' into 'master'

Patch email

See merge request !981
Merge branch 'fix_signup_config' into 'master'

Fix signup config

See merge request !983