delta/gitlab/gitlab-ce.git/app/controllers/projects_controller.rb, branch button-focus-state

Merge branch 'master' into awardables

2016-06-03T13:20:11+00:00

Split Markdown rendering & reference gathering

2016-05-26T15:14:00+00:00

This splits the Markdown rendering and reference extraction phases into
two distinct code bases. The reference extraction phase no longer relies
on the html-pipeline Gem (and any related code) and allows for
extracting of references from multiple HTML nodes in a single pass. This
means that if you want to extract user references from 200 comments you
no longer need to run 200 times N number of queries, instead only a
handful of queries may be needed.

Merge branch 'master' into awardables

2016-05-25T12:41:25+00:00

Merge branch 'eReGeBe/gitlab-ce-feature/milestone-md' into 'master'

2016-05-20T21:08:57+00:00


Implement special GitLab markdown reference for milestones

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3453 by @eReGeBe, with two additions:

- Move changelog item to 8.8
- Fix cross-project milestone ref with invalid project, like https://gitlab.com/gitlab-org/gitlab-ce/commit/f7348cd348ad8f4a18d74dd668283a4e236f5790 did for labels

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13829

See merge request !3897

Merge remote-tracking branch 'origin/master' into eReGeBe/gitlab-ce-feature/milestone-md

2016-05-19T04:40:33+00:00

Signed-off-by: Rémy Coutable

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

2016-05-18T18:05:53+00:00

# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	app/models/note.rb
#	db/schema.rb
#	spec/models/note_spec.rb

Improve documentation and add changelog

2016-05-18T02:53:04+00:00

Let users set notification levels in projects which they are not members

2016-05-18T02:53:03+00:00

Rename `images` to `container_registry`

2016-05-09T17:29:57+00:00

Create table for award emoji

2016-05-06T08:47:11+00:00