delta/gitlab/gitlab-ce.git, branch 15584-remove-back-compat-code gitlab.com: gitlab-org/gitlab-ce.git Remove back-compat code that's not needed anymore 2016-05-18T04:44:54+00:00 Rémy Coutable remy@rymai.me 2016-05-18T04:44:54+00:00 4e58aa40b98aa1cb758b1386b961f3bf15671bd7 Signed-off-by: Rémy Coutable <remy@rymai.me> 
Signed-off-by: Rémy Coutable <remy@rymai.me>
Merge branch 'issue_17302' into 'master' 2016-05-18T04:31:12+00:00 Rémy Coutable remy@rymai.me 2016-05-18T04:31:12+00:00 da8ac1635f1c12e9455e7517bee29678c754d492 Fix api leaking notes when user is not authorized to read noteable fixes #17302 See merge request !4102 

Fix api leaking notes when user is not authorized to read noteable

fixes #17302

See merge request !4102
 Move note helper method to notes entity file 2016-05-18T02:41:53+00:00 Felipe Artur felipefac@gmail.com 2016-05-18T02:41:53+00:00 5bf49bb63d88b1cce2d9a44716b54acfa63ea657 






Merge branch 'fix/gitlab-import-data' into 'master'

2016-05-17T19:49:12+00:00

Robert Speicher
robert@gitlab.com

2016-05-17T19:49:12+00:00

98d88e8188f551533390ca9dcb1247e5af6807cf


fix typo making gitlab.com importing to fail

Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/565

See merge request !4181





fix typo making gitlab.com importing to fail

Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/565

See merge request !4181






added CHANGELOG
2016-05-17T13:29:53+00:00

James Lopez
james@jameslopez.es

2016-05-17T13:29:53+00:00

ab2a1d23459294d3ce61e8558538f38cb5f29bb9












fix typo from bad refactoring
2016-05-17T13:19:59+00:00

James Lopez
james@jameslopez.es

2016-05-17T13:19:59+00:00

4e9ce5abe2c18089f02ab9f3a3e12c4ccae16af6












Merge branch 'instrument-api-helpers' into 'master'

2016-05-16T23:12:55+00:00

Rémy Coutable
remy@rymai.me

2016-05-16T23:12:55+00:00

28eea9bdfd0b28ad044f76bd4fcf988329ca9921


Instrument all Grape API helpers

This has been added to help us figure out what's making certain Grape API calls slow (e.g. the one used for authorized keys as described in gitlab-com/operations#99).

See merge request !4169





Instrument all Grape API helpers

This has been added to help us figure out what's making certain Grape API calls slow (e.g. the one used for authorized keys as described in gitlab-com/operations#99).

See merge request !4169






Instrument all Grape API helpers
2016-05-16T22:16:49+00:00

Yorick Peterse
yorickpeterse@gmail.com

2016-05-16T22:10:32+00:00

b933367ab3d8df50f0ebd0690d306536f7a654db












Merge branch 'dz-fix-sidebar-overlap' into 'master'

2016-05-16T21:47:21+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2016-05-16T21:47:21+00:00

4ade5ff42511d7931bebb28098c2dc2192caba3e


Fix left sidebar overlap when scroll on long menu

Fixes #17566. Caused by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4139. Smaller fix compared to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4164

cc @iamphill @jschatz1 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !4165





Fix left sidebar overlap when scroll on long menu

Fixes #17566. Caused by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4139. Smaller fix compared to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4164

cc @iamphill @jschatz1 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !4165






Merge branch 'issue_14684' into 'master'

2016-05-16T21:05:05+00:00

Douwe Maan
douwe@gitlab.com

2016-05-16T21:05:05+00:00

8b15628dd0de2474ad662b8d78a7c9a466e2a296


Toggle email signup confirmation in admin settings

Implements toggling verification email #14684

See merge request !3862





Toggle email signup confirmation in admin settings

Implements toggling verification email #14684

See merge request !3862