delta/gitlab/gitlab-ce.git, branch rs-markdown-preview-tabindex

Remove tab stop from "Write", "Preview", "Go full screen" links

2016-04-10T00:02:36+00:00

Closes #15089

Merge branch '14400-diff-redesign' into 'master'

2016-04-09T22:19:47+00:00


Diff redesign

Fixes #14400 
Fixes #13500 

![diffs_redesign](/uploads/16da9557e497114d886ef5ece2f306b3/diffs_redesign.gif)

See merge request !3476

Merge branch 'upgrade-sprockets' into 'master'

2016-04-09T20:32:17+00:00


Update sprockets to 3.6.0

Sprockets 3.5.0 reintroduces GZIP-ing and 3.6.0 includes performance improvements.
Changelog: https://github.com/rails/sprockets/blob/3.x/CHANGELOG.md

Closes #14344.

See merge request !3544

Merge branch 'schema-remove-twitter-sharing' into 'master'

2016-04-09T20:07:23+00:00


Ensure schema version matches latest migration

From commit 85cc1729596ac1e5b31d8cfa1daa07477db6033d

See merge request !3627

Apparently I missed updating the schema.rb when removing the Twitter "Congrats" button

2016-04-09T17:28:47+00:00

From commit 85cc1729596ac1e5b31d8cfa1daa07477db6033d

Upgrade Sprockets from 3.3.5 to 3.6.0.

2016-04-09T14:29:57+00:00

Sprockets 3.5.0 reintroduces GZIP-ing and 3.6.0 includes performance improvements. Changelog: https://github.com/rails/sprockets/blob/3.x/CHANGELOG.md

Resolves #14344.

Minor Testing guide copyedits

2016-04-09T05:19:21+00:00

[ci skip]

Merge branch 'rs-update-rails' into 'master'

2016-04-09T04:07:48+00:00


Bump rails to 4.2.6

See merge request !3424

Merge branch 'efficient-emoji-loading' into 'master'

2016-04-09T00:17:12+00:00


Only load emoji spritesheet when necessary

On a normal issue where the only award emoji displayed by default are
the thumbs-up and thumbs-down emoji, this decreases the page load by
670KB or 250KB depending on pixel density.

Resolves #14334.

See merge request !3449

Add "sprite" parameter to emoji_icon helper

2016-04-08T23:38:31+00:00

The emoji_icon helper used to display the award emoji in Issue and
Merge Request views. By default the spritesheet is used, but passing
`sprite: false` to the `emoji_icon` helper makes the emoji render as
separate images.

For award emoji displayed by default (e.g. thumbs-up, thumbs-down, and
any that have been awarded to the issue/MR) the independent images are
used. Only when the full emoji menu is opened does the full spritesheet
load.

On a normal issue this change decreases the page load by 670KB or 250KB
depending on pixel density.

Resolves #14334.