Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

CHANGELOG

Gemfile

Gemfile.lock

app/views/dashboard/issues.atom.builder

app/views/dashboard/show.atom.builder

app/views/groups/show.atom.builder

app/views/projects/_issuable_form.html.haml

app/views/projects/diffs/_file.html.haml

app/views/projects/issues/_form.html.haml

app/views/projects/merge_requests/_new_submit.html.haml

app/views/users/show.atom.builder

doc/permissions/permissions.md