delta/gitlab/gitlab-ce.git, branch parallel-diff-alignment

Break in middle of word if a span within parallel view

2016-04-25T21:12:32+00:00

Reduce width of parallel diffs

2016-04-22T19:16:24+00:00

Merge branch 'fix-issue-with-assignee-not-updating' into 'master'

2016-04-22T14:58:18+00:00


Fixed issue with assignee object not being returned

Closes #15515

See merge request !3877

Fixed issue with assignee object not being returned

2016-04-22T12:30:58+00:00

Closes #15515

Merge branch 'issue_3799' into 'master'

2016-04-22T08:40:01+00:00


Allow filtering by Owned projects on dashboard page

Closes #3799 

![Screen_Shot_2016-04-15_at_9.40.52_PM](/uploads/440498c5647bda282304891307931a02/Screen_Shot_2016-04-15_at_9.40.52_PM.png)

See merge request !3762

Merge branch 'doc-gh-import-additions' into 'master'

2016-04-22T08:36:37+00:00


Add newest enhancements to GH importer docs

[ci skip]

See merge request !3867

Merge branch 'confirmation-screen' into 'master'

2016-04-22T08:34:59+00:00


Improved email confirmation UX

Closes #4228

See merge request !3184

Add newest enhancements to GH importer docs

2016-04-22T08:20:37+00:00

[ci skip]

Merge branch 'doc_note_cherry_pick' into 'master'

2016-04-22T07:50:35+00:00


Use new Note styleguide



See merge request !3866

Merge branch 'rs-diff_view' into 'master'

2016-04-22T07:49:46+00:00


Always read diff_view setting from the cookie

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 and https://gitlab.com/gitlab-org/gitlab-ce/issues/15285

See merge request !3732