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

Fix for Emoji

2015-11-20T09:13:43+00:00

Merge branch 'rs-safari-clipboard-fallback' into 'master'

2015-11-19T23:23:31+00:00


Add a fallback for Safari copy-to-clipboard

Also, hide the tooltip in a less stupid way.

Closes #3547

See merge request !1844

Merge branch 'emoji_votes' into 'master'

2015-11-19T21:34:38+00:00


Award Emoji

This it first iteration of award emoji feature.
We have plan to extend emoji picker by the next release.

For now, you can add award by clicking to the emoji picker or posting a regular comment with emoji like ":+1:" and any other. You can post not only emoji that listed in the emoji picker.

See merge request !1825

Add a fallback for Safari copy-to-clipboard

2015-11-19T21:06:53+00:00

Also, hide the tooltip in a less stupid way.

Closes #3547

Merge branch 'dirceu/gitlab-ce-new-merge-request-from-file-edit' into 'master'

2015-11-19T16:45:45+00:00


Add option to create merge request when editing/creating a file

Replaces !1611 

Fixes #3059

See merge request !1820

adressing comments

2015-11-19T16:12:17+00:00

Merge branch 'builds_page_scroll_buttons' into 'master'

2015-11-19T13:00:42+00:00


Fix bottom position of scroll buttons in build log page

Look at the up/down buttons as well as the **Enable Autoscroll**.

The **Enable Autoscroll** could also be alligned with the right grey box.


## Before

![autoscroll_before](/uploads/f410dc353ca66c338d8a29c7c294758a/autoscroll_before.png)

## After

![autoscroll_after](/uploads/015fdf53618a0d6f468d666de1bbab6a/autoscroll_after.png)


\cc @dzaporozhets @creamzy 

See merge request !1792

added spinach tests

2015-11-19T11:20:09+00:00

Few minor improvements to emoji awards UI

2015-11-19T09:59:58+00:00

Signed-off-by: Dmitriy Zaporozhets

Improve UI for emoji awards

2015-11-19T09:50:38+00:00

Signed-off-by: Dmitriy Zaporozhets