delta/gitlab/gitlab-ce.git/spec/lib, branch fix/encoding-binary-issue

Merge branch '29690-rotate-otp-key-base' into 'master'

2017-06-06T03:24:10+00:00

Add a Rake task to aid in rotating otp_key_base

Closes #29690

See merge request !11881

Add a Rake task to aid in rotating otp_key_base

2017-06-05T21:17:52+00:00

Merge branch 'mk-fix-git-over-http-rejections' into 'master'

2017-06-05T19:56:19+00:00

Fix Git-over-HTTP rejections

See merge request !11398

Merge branch 'jej-backport-protected-tag-ee-role-refactorings' into 'master'

2017-06-05T18:32:37+00:00

Backport EE refactorings for Protected Tag EE-only functionality

See merge request !11125

Merge branch '31983-increase-merge-request-diff-file-size-limit-for-default-toggle-opening' into 'master'

2017-06-05T13:58:54+00:00

Increase diff limits to 100 KB for collapse and 200 KB overall

Closes #31983

See merge request !11875

Refactor to remove a special case

2017-06-05T12:32:26+00:00

Clarify error messages

2017-06-05T12:32:26+00:00

And refactor to self-document a little better.

Refactor to let GitAccess errors bubble up

2017-06-05T12:32:26+00:00

No external behavior change.

This allows `GitHttpController` to set the HTTP status based on the type of error. Alternatively, we could have added an attribute to GitAccessStatus, but this pattern seemed appropriate.

Move CI access logic into GitAccess

2017-06-05T12:32:26+00:00

Refactor

2017-06-05T12:32:26+00:00