delta/gitlab/gitlab-ce.git/app/assets, branch doc_refactor_keys_api

Merge branch 'margin-update' into 'master'

2016-01-18T00:52:42+00:00


update

old
![Screenshot_2016-01-14_22.46.52](/uploads/d165897a6118c4b276e6b53982077cb5/Screenshot_2016-01-14_22.46.52.png)

new
![Screenshot_2016-01-14_22.46.21](/uploads/6b34cd8b1a2799506676103fcbc80450/Screenshot_2016-01-14_22.46.21.png)


See merge request !2441

Merge branch 'diff-white-line-fix' into 'master'

2016-01-18T00:34:17+00:00


Removes white line when hiding diff comments in MR

Fixes #6071 

See merge request !2407

Merge branch 'comment-text-remains-in-text-box-after-submitting-it' into 'master'

2016-01-18T00:19:34+00:00


Fixes issue where firefox does not delete message after comment submit

Issue was **not** in the way comment was being submitted.
`app/assets/javascripts/awards_handler.coffee` was throwing an error.
This error was preventing any js from running after it.
Fixes #1473

See merge request !2452

Merge branch 'issue-page-keeps-jumping-up' into 'master'

2016-01-17T17:01:35+00:00


Issue page keeps jumping up

This happens when the discussion side is smaller than the sidebar and the sidebar will need to scroll. When this happens I calculate the height of the two and see if the discussion panel is smaller and make them the same height and add a class `no-affix` which makes the sidebar relative positioning so it won't stick to the top.

See merge request !2417

Autosize the textarea in showEditForm

2016-01-17T03:17:57+00:00

[ci skip]

Fixes issue where firefox does not delete message after comment submit

2016-01-15T19:06:31+00:00

Issue was **not** in the way comment was being submitted.
`app/assets/javascripts/awards_handler.coffee` was throwing an error.
This error was preventing any js from running after it.
Fixes #1473

Merge branch 'fix-alignment-issue' into 'master'

2016-01-15T16:34:48+00:00


Fix alignment issues after a fix on titles weight

Fixes #8102. Fixes #3956. This fixes an alignment regression introduced by !2422. Sorry about that! :/

## Commit title alignment fixed

![Screen_Shot_2016-01-14_at_16.10.01](/uploads/8fdc08dca379bc551f5872de910c7149/Screen_Shot_2016-01-14_at_16.10.01.png)

**The fact that the first row has a smaller height than the other rows was not introduced by !2422 (I've checked by reverting 818607f0 on `master`).**

## Tags name in list

![Screen_Shot_2016-01-14_at_16.10.09](/uploads/fba3978037677bb8855f374b5f38dde0/Screen_Shot_2016-01-14_at_16.10.09.png)

See merge request !2431

Remove unnecessary class

2016-01-15T10:14:33+00:00

Streamline item titles to use a single class, and add back strong tags

2016-01-15T10:10:55+00:00

Merge branch 'deleting-a-note-after-editing-another-results-in-a-javascript-error' into 'master'

2016-01-15T04:27:24+00:00


Fix javascript error with deleting messages in issue or merge request

Elements searched for by jQuery no longer existed in the DOM.
Javascript was also unnecessarily complex, for using jQuery

Fixes #8109

See merge request !2442