Temporary fix for #4305: Cant preview attached png images on notes; attachment.secure_url returns an url which is accessible
Merge remote-tracking branch 'upstream/master' into fix-4305
Commit message textareas have 72 char mark line.
Expose archive status of projects in API

That way clients like Gitlab CI can decide to show or hide projects
based on that information
Add info about exposed Project::archived to API docs
Added email threading for update emails on issues and merge requests (if the mail client support the References: mail header)
Now using correct ids as reference if we are informing about a new note.
Added some tests.
Fix can not automerge if description is too long
Use uid as username when creating user with LDAP

Without that commit, each user created by a LDAP login would have the
first part of their email address as nickname.

This is not useful for LDAP, where a uid attribute is already set.
Draft API method for merge MR

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fix dead links in ruby.md
Specify error codes for merge api

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Docs for merge api

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Let people know that Nihad Abbasov made a nice api wrapper.
Merge branch 'api-wrapper' into 'master'

Api wrapper
Add some tests for merge API

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge pull request #6959 from dtan4/fix-dead-links

Fix dead links in ruby.md
Merge branch 'use_ldap_uid_as_username_instead_of_first_part_of_email_address_on_user_creation' into 'master'

Use ldap uid as username instead of first part of email address on user creation
Merge branch 'master' of github.com:gitlabhq/gitlabhq