Robert Speicher authored 9 years ago and Jacob Vosmaer (GitLab) committed 9 years ago

Instead of using a fork, we subclass the filter and only apply the
`task-list` class to list items that actually are task lists.

Closes #1645

See https://github.com/github/task_list/pull/60

Stable 7-11 ce into ee

See merge request !407

Better handle label references that aren't actually references

Fixes #1690

See merge request !705

Fix leftover user checks for git_annex after refactoring

Fixes #291

See merge request !404

Cherry pick missed cherry picks into stable

cc @sytse @patricio

See merge request !405

Validate maximum active user count up until license issue date.

Step 1 of #298

cc @sytse @job

See merge request !402

7.11 CE to EE

See merge request !400

# Conflicts:
#	VERSION

Cherrypicks for 7.11

See merge request !1826

Fix Atom feeds.

Fixes #1643 and #1644.

See merge request !688

Updated the gitlab_git gem

Work around a Chrome 43 bug preventing note editing

Fixes #1568 - and I mean "fixes"

I have no idea what causes this or why this fixes it and can't dig into it further right now, but the bug seems like a blocker so this needs to be fixed for 7.11.

See merge request !684

Don't send notifications to mentioned users that don't have access to the project in question.

Fixes internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2325.

See merge request !664

Fixes #1651

workaround for buggy lexers

It seems that some lexers can be buggy when used together with git blame.
This results in a 500 error when a user tries to open the blame page in some cases.
The workaround is pretty simple. Not only fall back to plaintext when the file content can't be guessed, but also when the lexer fails.

This closes #1521 and #1646

/cc @DouweM @JobV It would be awesome to have this in a patch release for 7.11 or even in the release. But that's probably to late.

See merge request !683

Dmitriy Zaporozhets authored 9 years ago and Douwe Maan committed 9 years ago

Add explanation about WIP status to MR form.

![Screen_Shot_2015-05-15_at_13.48.49](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b3f70585255a043f07c61570549a90ba/Screen_Shot_2015-05-15_at_13.48.49.png)

![Screen_Shot_2015-05-15_at_13.49.01](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c9992708c8ef5ef4fa2bcc2c3173b8e3/Screen_Shot_2015-05-15_at_13.49.01.png)

See merge request !666

update download info

See merge request !399

Conflicts:
	VERSION
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.11.md

Don't require DB connection in AttrEncrypted.

See merge request !667

CE to EE

Fixes gitlab/gitlabhq#2330

See merge request !396

Update installation/update guides for 7.11.

See merge request !397

Update installation/update guides for 7.11.

See merge request !665

Conflicts:
	app/views/help/index.html.haml
	lib/gitlab/git_access.rb
	public/500.html
	public/502.html