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

Merge branch 'label-text-color-sidebar' into 'master'

2016-04-21T23:13:38+00:00


Fixes text color on labels in sidebar

Previously the labels in the sidebar would just have `#FFF` text color which could cause problems with a light background color.

With this, the text color comes from the JSON.

See merge request !3846

Reverted link changes

2016-04-21T17:46:12+00:00

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

2016-04-21T17:36:43+00:00

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2016-04-21T17:34:45+00:00

Merge branch 'label-dropdown-fix' into 'master'

2016-04-21T17:32:24+00:00


Fixes "create label" functionality on label dropdown

**Issue sidebar**

![label_dropdown](/uploads/2a056136fc88626530fc275ded0c2aa3/label_dropdown.gif)

**Issues page**

![label_dropdown_issues](/uploads/965fd20f5b206499e9b11a64556c5240/label_dropdown_issues.gif)



See merge request !3670

Merge branch 'diff-link-fix' into 'master'

2016-04-21T16:44:53+00:00


Diff highlight fixes

This fixes a couple of issues with linking/highlight diff lines:

- Fixed issue with lines not being selectable when expanding diff
- Fixed issue with incorrect line being highlighted if line is in discussion view

See merge request !3725

Removed console.log

2016-04-21T16:22:16+00:00

Merge branch 'issue_15434' into 'master'

2016-04-21T16:22:15+00:00


Fixes XSS injection

REF: https://gitlab.com/gitlab-org/gitlab-ce/issues/15434

**Without the fix**

![xss1](/uploads/0a7b0b15fb87066965a7c73f1dbaa815/xss1.gif)


**With the fix**

![xss2](/uploads/473cfa0aa80656f24c58aebf1fd97fff/xss2.gif)


See merge request !1952

Revert "Merge branch 'sentry-js' into 'master' "

2016-04-21T11:27:27+00:00

This reverts commit 0f309794e78243b1ee16ba6f1451dbb0752956c5, reversing
changes made to 1e596fef1c42a1dd925636c48fea01be444dc3ab.

Fixes text color on labels in sidebar

2016-04-21T07:50:15+00:00