delta/gitlab/gitlab-ce.git, branch emoji-unicode-fix gitlab.com: gitlab-org/gitlab-ce.git Removed usage of normilizeEmojiName method 2016-04-22T20:53:26+00:00 Phil Hughes me@iamphill.com 2016-04-22T20:53:26+00:00 13f7ba059e48ebf090d8f8ae440f277097494c52 Fixed some Ruby based on feedback 
Fixed some Ruby based on feedback
Fixes issue with emoji comments not showing correct emoji image 2016-04-22T16:01:53+00:00 Phil Hughes me@iamphill.com 2016-04-22T16:01:53+00:00 319c9360551280f7345c5d16ffb34fe5e73a1598 Previously it would look for the unicode character inside the award menu. But this menu might not always be there. Now, the unicode characters are loaded onto the page in an array which the award emoji that looks in to get the correct emoji unicode character Fixes #15512 
Previously it would look for the unicode character inside the award menu. But this menu might not always be there.

Now, the unicode characters are loaded onto the page in an array which the award emoji that looks in to get the correct emoji unicode character

Fixes #15512
Merge branch 'issue_3799' into 'master' 2016-04-22T08:40:01+00:00 Rémy Coutable remy@rymai.me 2016-04-22T08:40:01+00:00 d5398e9656c1174d4d5be5a8cdad2a26d7587a27 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 

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 Achilleas Pipinellis axilleas@axilleas.me 2016-04-22T08:36:37+00:00 15e225940bc97d5f5985d2641a3eb70a8f4c38ee Add newest enhancements to GH importer docs [ci skip] See merge request !3867 

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 Robert Speicher robert@gitlab.com 2016-04-22T08:34:59+00:00 2193a3535b3499a09f6be57f807ee5832317b574 Improved email confirmation UX Closes #4228 See merge request !3184 

Improved email confirmation UX

Closes #4228

See merge request !3184
 Add newest enhancements to GH importer docs 2016-04-22T08:20:37+00:00 Achilleas Pipinellis axilleas@axilleas.me 2016-04-22T08:20:37+00:00 846a9ef5ad5d946fefa135ce31efefab384f760c [ci skip] 
[ci skip]
Merge branch 'doc_note_cherry_pick' into 'master' 2016-04-22T07:50:35+00:00 Achilleas Pipinellis axilleas@axilleas.me 2016-04-22T07:50:35+00:00 c39032937a447e44afee3c96971d489a4da39ff1 Use new Note styleguide See merge request !3866 

Use new Note styleguide



See merge request !3866
 Merge branch 'rs-diff_view' into 'master' 2016-04-22T07:49:46+00:00 Rémy Coutable remy@rymai.me 2016-04-22T07:49:46+00:00 5a8873f362557c4002858fe323d5c346a89c91b3 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 

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
 Use new Note styleguide 2016-04-22T07:42:30+00:00 Achilleas Pipinellis axilleas@axilleas.me 2016-04-22T07:42:30+00:00 de39959f559d8f1be73a11714abcd2782f476fea [ci skip] 
[ci skip]
Merge branch 'fix/private-labels-permissions' into 'master' 2016-04-22T06:51:40+00:00 Grzegorz Bizon grzegorz@gitlab.com 2016-04-22T06:51:40+00:00 988dad46499e22defc4e0b646b4580db23a44925 Fix vulnerability that leaks private labels and milestones ## Summary This fixes vulnerability that leaks information about private labels and milestones because of insecure direct object reference in issueable create service. This affects merge requests and issues. See https://gitlab.com/gitlab-org/gitlab-ce/issues/15439 ## Fix This MR introduces additional check that rejects labels and milestone that does not belong to the same project issue/merg request does. ## Further work `IssuableBaseService` may benefit from encapsulating filters in separate class/module, which then may improve coherency in this class. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15439 See merge request !1954 

Fix vulnerability that leaks private labels and milestones

## Summary

This fixes vulnerability that leaks information about private labels and milestones because of  insecure direct object reference in issueable create service.
This affects merge requests and issues.

See https://gitlab.com/gitlab-org/gitlab-ce/issues/15439

## Fix

This MR introduces additional check that rejects labels and milestone that does not belong to the same project issue/merg request does.

## Further work

`IssuableBaseService` may benefit from encapsulating filters in separate class/module, which then may improve coherency in this class.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15439

See merge request !1954