delta/gitlab/gitlab-ce.git/config, branch coffeescript_syntax_error

Merge branch 'bring-back-newrelic-gem' into 'master'

2016-02-24T07:25:36+00:00


Revert "Remove newrelic gem. Closes #12860"

This reverts commit 531767175f0a364a332c74bf27c5f202732ce519.

Conflicts:
	Gemfile.lock

See merge request !2943

Merge branch 'issue_13301_emoji-menu' into 'master'

2016-02-24T02:50:45+00:00


Load award emoji picker with ajax request

Fixes #13301.

See merge request !2888

Revert "Remove newrelic gem. Closes #12860"

2016-02-23T15:25:37+00:00

This reverts commit 531767175f0a364a332c74bf27c5f202732ce519.

Conflicts:
	Gemfile.lock

Create EmojisController

2016-02-23T02:16:00+00:00

Properly set `auto_link_saml_user` default value in the Settings loader.

2016-02-22T16:59:15+00:00

Add missing route to mark all todos as done

2016-02-21T15:57:12+00:00

Rename Tasks to Todos

2016-02-20T14:39:27+00:00

Allow user to mark each task as done manually

2016-02-20T14:10:26+00:00

Add tasks queue list page

2016-02-20T14:10:26+00:00

Remove code introduced when endpoint was in MR controller.

2016-02-19T18:14:52+00:00