delta/gitlab/gitlab-ce.git/app/models, branch rc/enable-PreferredHashMethods-cop gitlab.com: gitlab-org/gitlab-ce.git Enable the Style/PreferredHashMethods cop 2017-06-02T17:11:26+00:00 Rémy Coutable remy@rymai.me 2017-06-02T17:11:26+00:00 4cfa5ce4a95379a9ebe08f57b170af4b5ee9a9a5 Signed-off-by: Rémy Coutable <remy@rymai.me> 
Signed-off-by: Rémy Coutable <remy@rymai.me>
Merge branch '33215-fix-hard-delete-of-users' into 'master' 2017-06-02T15:10:40+00:00 Douwe Maan douwe@gitlab.com 2017-06-02T15:10:40+00:00 f123b6523328cec6445b32977f913e565f3965da Fix hard-deleting users when they have authored issues Closes #33215 See merge request !11855 
Fix hard-deleting users when they have authored issues

Closes #33215

See merge request !11855
 Merge branch '31511-jira-settings' into 'master' 2017-06-02T14:03:15+00:00 Sean McGivern sean@mcgivern.me.uk 2017-06-02T14:03:15+00:00 dab266219441144a74b86fa27f4e0528810482d1 Simplify test&save actions when setting a service integration Closes #31511 See merge request !11599 
Simplify test&save actions when setting a service integration

Closes #31511

See merge request !11599
 Fix hard-deleting users when they have authored issues 2017-06-02T01:06:56+00:00 Nick Thomas nick@gitlab.com 2017-06-01T16:30:01+00:00 7db09c63cc4532acea2d736f667b36c96b22007d 






Rename `Gitlab::Git::EncodingHelper` to `Gitlab::EncodingHelper`
2017-06-01T21:21:14+00:00

Bob Van Landuyt
bob@gitlab.com

2017-06-01T21:21:14+00:00

e564fe971f3dacb1a2a38ad984b865ae23e54400












Merge branch 'zj-realtime-env-list' into 'master'
2017-06-01T20:38:46+00:00

Kamil Trzciński
ayufan@ayufan.eu

2017-06-01T20:38:46+00:00

8d131eb85ddc1ee6cd4a27830b2607617d767f28

Realtime env list

Closes #31701

See merge request !11333




Realtime env list

Closes #31701

See merge request !11333






Merge branch 'dm-gravatar-username' into 'master'
2017-06-01T17:19:17+00:00

Sean McGivern
sean@mcgivern.me.uk

2017-06-01T17:19:17+00:00

97d6085fb507d53f92699d5cfea06dd319125994

Add username parameter to gravatar URL

Closes #24472

See merge request !11741




Add username parameter to gravatar URL

Closes #24472

See merge request !11741






Merge branch '24196-protected-variables' into 'master'
2017-06-01T17:18:03+00:00

Kamil Trzciński
ayufan@ayufan.eu

2017-06-01T17:18:03+00:00

950db1bd6472813bb539b69a309402c4eb115122

Implementation for protected variables

Closes #24196

See merge request !11688




Implementation for protected variables

Closes #24196

See merge request !11688






Merge branch 'dm-comment-on-mr-commit-discussion' into 'master'
2017-06-01T16:25:01+00:00

Grzegorz Bizon
grzegorz@gitlab.com

2017-06-01T16:25:01+00:00

42c13b26dab4f52e90bc8be2b6f46d2ef9559ccd

Fix replying to a commit discussion displayed in the context of an MR

Closes #33201

See merge request !11847




Fix replying to a commit discussion displayed in the context of an MR

Closes #33201

See merge request !11847






Merge branch 'migrate-old-artifacts' into 'master'
2017-06-01T15:43:35+00:00

Grzegorz Bizon
grzegorz@gitlab.com

2017-06-01T15:43:35+00:00

aff097e8f528ab5b00842df7c76d3435b1e59c96

Fix data inconsistency issue for old artifacts by moving them to a currently used path

Closes #32036

See merge request !11824




Fix data inconsistency issue for old artifacts by moving them to a currently used path

Closes #32036

See merge request !11824