delta/gitlab/gitlab-ce.git/spec/lib, branch performance-bar-sql

Merge branch '18765-stub_env_in_specs' into 'master'

2017-10-19T12:43:15+00:00

Resolve "Add a 'custom cop' to RuboCop that bans ENV assignment"

Closes #18765

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

Avoind unnecesary `force_encoding` operations

2017-10-19T00:30:29+00:00

They're costly. This will also avoid some edge cases where
charlock_holmes assigns a weird encoding to a perfectly valid UTF-8
string.

Stub ENV in the backup task spec file

2017-10-18T16:42:09+00:00

Signed-off-by: Rémy Coutable

Merge branch 'sh-security-fix-backports-master' into 'master'

2017-10-18T11:08:04+00:00

Backport all fixes from GitLab 10.1 into master

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

Merge branch 'tc-saml-fix-false-empty' into 'master'

2017-10-18T10:26:51+00:00

SAML fix when auth hash attributes do not define groups

Closes #38923

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

Fix SAML error 500 when no groups are defined for user

2017-10-18T08:17:14+00:00

When there are no groups defined in the auth hash attributes,
`Gitlab::Saml::AuthHash#groups` should return an empty array, and
`Gitlab::Saml::User#find_user` should not mark the user as external.

Closes gitlab-org/gitlab-ce#38923.

Merge branch 'master' into sh-security-fix-backports-master

2017-10-17T23:02:32+00:00

Merge branch 'security-10-1' into '10-1-stable'

2017-10-17T22:58:58+00:00

Security fixes for 10.1 RC

See merge request gitlab/gitlabhq!2209

Merge branch 'bvl-do-not-use-redis-keys' into 'master'

2017-10-17T16:15:44+00:00

Avoid using `Redis#keys`

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

Handle null serialised commits in background migration

2017-10-17T11:15:40+00:00

This is already handled for diffs, but not commits.