delta/gitlab/gitlab-ce.git/Gemfile, 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

Update sentry-raven to 0.15.6

2016-02-23T20:34:16+00:00

Revert "Remove newrelic gem. Closes #12860"

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

This reverts commit 531767175f0a364a332c74bf27c5f202732ce519.

Conflicts:
	Gemfile.lock

Upgrade gitlab_git to 8.2.0

2016-02-19T18:15:39+00:00

Merge branch 'rs-emoji' into 'master'

2016-02-19T08:11:02+00:00


Update Gemojione for new hotness :sparkles:

Before | After
------ | -----
![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) | ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png)

See merge request !2800

Bump unicorn to `~> 4.9.0`

2016-02-16T23:15:06+00:00

Update omniauth to 1.3.1 for memory performance

2016-02-13T03:59:55+00:00

Update gitlab_emoji to ~> 0.3.0

2016-02-12T20:34:00+00:00

Loosen Nokogiri version requirement

2016-02-11T19:31:31+00:00

Closes #13218

Merge branch 'improve-diverging-commit-counts' into 'master'

2016-02-05T21:45:48+00:00


Dedicated method for counting commits between refs

Corresponding gitlab_git merge request: https://gitlab.com/gitlab-org/gitlab_git/merge_requests/66
Issue that lead to these changes: https://gitlab.com/gitlab-org/gitlab-ce/issues/12619

See merge request !2707