Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG-EE

Merge Request Labels

Accept merge request API

This MR adds new endpoint `PUT /projects/:id/merge_request/:merge_request_id/merge`. After this change you can merge branches using API.

Fixes internal issue #1166

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Added email threading for update emails on issues and merge requests

Temporary fix for #4305: Cant preview attached png images on notes; attachment.secure_url returns an url which is accessible

Commit message textareas have 72 char mark line.

Fix can not automerge when description is too long

Expose archive status of projects in API

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

Fix dead links in ruby.md

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Api wrapper

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Changelog satellite

Monthly release doc revision

/cc @sytse @jacobvosmaer @marin @dzaporozhets @marc

Fix typo in doc/install/requirements.md

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Expose project visibility in system service hooks

Our gitlab installation is currently setup with a system hook to ping our hubot. Currently whenever a project is created, hubot announces this, regardless of project visibility. It didn't really make sense for everyone to see this, and as the project visibility wasn't exposed in the JSON hook output, I thought I'd add it in!

As far as I'm aware, tests still run and pass OK. I'm not exactly rails savvy though, so any pointers/fixes/etc, please let me know!

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.

Fix css rules conflict between .dark & a.dark classes

Link to installation doc

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fix wiki backup skip bug

This fixes a bug where wiki repositories for projects with an empty main
repository would not get backed up.

Mixin cleanup

* Remove old mixins
* add issue box shadow
* change color for network graph box