delta/gitlab/gitlab-ce.git, branch rs-diff_view

Clarify that the diff view setting always comes from the cookie

2016-04-19T21:47:58+00:00

This invalidates one test, which we've removed.

Always read diff_view setting from the cookie

2016-04-14T21:38:34+00:00

Prior, when the user had their view set to "parallel" and then visited a
merge request's changes tab _without_ passing the `view` parameter via
query string, the view would be parallel but the `Notes` class was
always instantiated with the default value from `diff_view` ("inline"),
resulting in broken markup when the form to add a line note was
dynamically inserted.

The cookie is set whenever the view is changed, so this value should
always be up-to-date.

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

Merge branch '14176-diff-paste-data' into 'master'

2016-04-14T21:01:08+00:00


Copying and pasting doesn't grab line numbers or +/-

Fixes #14176 

See merge request !3687

Merge branch 'rs-sentry-contexts' into 'master'

2016-04-14T20:18:01+00:00


Add Sentry program context even without a current user



See merge request !3729

Merge branch 'remove-ci-nginx-config' into 'master'

2016-04-14T19:34:57+00:00


Remove deprecated NGINX CI config

[ci skip]

See merge request !3728

Merge branch 'emoji_category_fix' into 'master'

2016-04-14T18:22:49+00:00


Emoji categories fix

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14020

See merge request !3727

Merge branch 'subscribe-button-fix' into 'master'

2016-04-14T18:11:18+00:00


Removed references to subscribe-button CSS class

These were being blocked by adblocks

Closes #15043

See merge request !3677

Add Sentry program context even without a current user

2016-04-14T17:56:30+00:00

Emoji categories fix

2016-04-14T17:45:55+00:00

Syntax & style updates

2016-04-14T17:33:29+00:00