delta/gitlab/gitlab-ce.git/app, branch github-import-docs

Merge branch 'ide-highlighter-type-fox' into 'master'

2018-06-04T08:51:46+00:00

Fixed typo in commit message help popover

Closes #47060

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

Merge branch 'sh-fix-secrets-not-working' into 'master'

2018-06-04T08:37:53+00:00

Fix attr_encryption key settings

Closes #47166

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

Fix attr_encryption key settings

2018-06-02T12:24:59+00:00

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

Fix bootstrap 4 file inputs

2018-06-01T21:58:00+00:00

Merge branch 'fix-feature-memoization' into 'master'

2018-06-01T18:56:21+00:00

Use RequestStore to memoize Flipper features so that memoized values are cleared between requests

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

Remove ambiguity in Group class causing build failures

2018-06-01T18:18:18+00:00

https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/71887977 was failing
due to confusion between Ci::Group and Group.
https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/71887977

Merge branch 'sh-bump-ruby-2.4' into 'master'

2018-06-01T17:59:04+00:00

Upgrade to Ruby 2.4.4

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

Merge branch 'revert-c640e579' into 'master'

2018-06-01T17:22:36+00:00

Revert "Merge branch '46833-sticky-polyfill' into 'master'"

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

Resolve "Branch names in system notes have incorrect color"

2018-06-01T17:02:59+00:00