fix for project creation: group projects don't count towards user's project limit
Add summaries for notes and merge requests to dashboard feed.

This fixes #305.
Fix username validation message to match regexp.

Also used for project, group and web ui new file names.
Move standard login form to the auth settings where users expect them.
Updated ATOM feed partials to use markdown instead of simple_format.
Improve the documentation of the signup item, password items is outdated now since people are used to the behaviour.
Remove 'socket' example PostgreSQL parameter

The ActiveRecord PostgreSQL adapter does not have a 'socket' option;
see:

https://github.com/rails/rails/blob/4-1-2/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L20
Remove stale comment in Gemfile

The comment was added in a91a6491bf3e74791ecf8dd1111d54435b8578cb, and referred to the below gem `grape-entity` being pulled directly from a Git repo. The `gem` command has already been changed to pull directly from Rubygems, so the comment is no longer necessary.
Add a mention of the merge request into its default commit message.
Merge branch 'better-location-for-signin-disable' into 'master'

Better location for signin disable

Make it easier for people to find these settings where they are expected, under auth settings.
Merge pull request #6629 from sykano/fix-project-limit-for-groups

fix for project creation: group projects don't count towards user's project limit
Merge pull request #7204 from cirosantilli/user-validation-msg

Fix username validation message to match regexp.
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Merge branch 'fix-stale-gemfile-comment' into 'master'

Remove stale comment in Gemfile

The comment was added in a91a6491bf3e74791ecf8dd1111d54435b8578cb, and referred to the below gem `grape-entity` being pulled directly from a Git repo. The `gem` command has already been changed to pull directly from Rubygems, so the comment is no longer necessary.
Merge branch 'bugfix/305/dashboard_feed_summaries' into 'master'

Incorporate Summaries for Notes and Merge Requests Into Dashboard Feed

This MR fixes #305 by adding summaries for notes and merge requests into the dashboard feed.
When assigning an unassigned issue send notification with the correct text.
Fix tests because previous assignee didn't exist.
Remove unecessary return.
Merge branch 'reference_merge_request_in_commit_message' into 'master'

Add reference to the merge request in the default merge request commit message

This adds a link to the merge request to the merge request commit.

If merge requests are used for code review, the merge in git is now linked to the code review.

See http://feedback.gitlab.com/forums/176466-general/suggestions/6088000-in-the-default-merge-request-commit-message-add-a
Merge branch 'assignement_change_notifications' into 'master'

Assignment change notifications

Fixes #1377