delta/gitlab/gitlab-ce.git/changelogs, branch github-import-docs gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'sh-fix-source-project-nplus-one' into 'master' 2018-06-04T10:12:23+00:00 Sean McGivern sean@mcgivern.me.uk 2018-06-04T10:12:23+00:00 0b4f9ff4068af6776b495d9332aeecf58e48786f Fix N+1 with source_projects in merge requests API See merge request gitlab-org/gitlab-ce!19346 
Fix N+1 with source_projects in merge requests API

See merge request gitlab-org/gitlab-ce!19346
 Merge branch 'bvl-bump-gitlab-shell-7-1-3' into 'master' 2018-06-04T09:43:09+00:00 Douwe Maan douwe@gitlab.com 2018-06-04T09:43:09+00:00 c63cd738b1eed64565cfa8213799c75b5371f994 Bump gitlab-shell to 7.1.3 See merge request gitlab-org/gitlab-ce!19358 
Bump gitlab-shell to 7.1.3

See merge request gitlab-org/gitlab-ce!19358
 Merge branch 'sh-fix-secrets-not-working' into 'master' 2018-06-04T08:37:53+00:00 Douwe Maan douwe@gitlab.com 2018-06-04T08:37:53+00:00 414daf34e988390ab118a85c536187d15e6070bc Fix attr_encryption key settings Closes #47166 See merge request gitlab-org/gitlab-ce!19341 
Fix attr_encryption key settings

Closes #47166

See merge request gitlab-org/gitlab-ce!19341
 Bump gitlab-shell to 7.1.3 2018-06-04T06:49:47+00:00 Bob Van Landuyt bob@vanlanduyt.co 2018-06-04T06:31:03+00:00 4bfd208b9f1738a67cac149ccac7ec2153c43448 This includes the change that prints the @username of a user instead of the full name. https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/204 
This includes the change that prints the @username of a user instead
of the full name.

https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/204
Merge branch 'master' into per-project-pipeline-iid 2018-06-04T03:04:04+00:00 Shinya Maeda shinya@gitlab.com 2018-06-04T03:04:04+00:00 12b41a194bc622f598937868f704780e59ea64a9 






Update selenium-webdriver to 3.12.0
2018-06-03T15:18:52+00:00

Takuya Noguchi
takninnovationresearch@gmail.com

2018-06-03T15:15:58+00:00

0b648a492060654126de86d813c1b877535de832












Fix N+1 with source projects in merge requests API
2018-06-03T11:24:23+00:00

Stan Hu
stanhu@gmail.com

2018-06-03T10:31:41+00:00

bd4bfcc6411e4819c0c67717095bb2e54e7bb6df

Now that we are checking `MergeRequest#for_fork?`, we also need
the source project preloaded for a merge request.





Now that we are checking `MergeRequest#for_fork?`, we also need
the source project preloaded for a merge request.







Fix attr_encryption key settings
2018-06-02T12:24:59+00:00

Stan Hu
stanhu@gmail.com

2018-06-02T09:32:30+00:00

61df812ac688cb0848752f9f26f77d65eadf160a

attr_encrypted does different things with `key` depending on what mode you are using:

1. In `:per_attribute_iv_and_salt` mode, it generates a hash with the salt:
https://github.com/attr-encrypted/encryptor/blob/c3a62c4a9e74686dd95e0548f9dc2a361fdc95d1/lib/encryptor.rb#L77.
There is no need to truncate the key to 32 bytes here.

2. In `:per_attribute_iv` mode, it sets the key directly to the password, so
truncation to 32 bytes is necessary.

Closes #47166





attr_encrypted does different things with `key` depending on what mode you are using:

1. In `:per_attribute_iv_and_salt` mode, it generates a hash with the salt:
https://github.com/attr-encrypted/encryptor/blob/c3a62c4a9e74686dd95e0548f9dc2a361fdc95d1/lib/encryptor.rb#L77.
There is no need to truncate the key to 32 bytes here.

2. In `:per_attribute_iv` mode, it sets the key directly to the password, so
truncation to 32 bytes is necessary.

Closes #47166







Merge branch 'master' into per-project-pipeline-iid
2018-06-02T02:15:53+00:00

Shinya Maeda
shinya@gitlab.com

2018-06-02T02:15:53+00:00

b02b2602c1bcfd60b760fbfd1aca936475d78474












Merge branch 'sh-bump-omniauth-gitlab' into 'master'
2018-06-01T17:00:27+00:00

Robert Speicher
robert@gitlab.com

2018-06-01T17:00:27+00:00

1cb3b9b29cd7a3e086b204f06971ffd562cb6330

Bump omniauth-gitlab to 1.0.3

See merge request gitlab-org/gitlab-ce!19319




Bump omniauth-gitlab to 1.0.3

See merge request gitlab-org/gitlab-ce!19319