delta/gitlab/gitlab-ce.git/spec/controllers, branch commit-header

Merge branch 'stanhu/gitlab-ce-fix-error-500-false-binary-negative'

2016-06-15T13:56:02+00:00

UI and copywriting improvements

2016-06-14T11:18:14+00:00

+ Move 'Edit Project/Group' out of membership-related partial
+ Show the access request buttons only to logged-in users
+ Put the request access buttons out of in a more visible button
+ Improve the copy in the #remove_member_message helper

Signed-off-by: Rémy Coutable

Factorize #request_access and #approve_access_request into a new AccessRequestActions controller concern

2016-06-14T11:07:26+00:00

Signed-off-by: Rémy Coutable

Add request access for groups

2016-06-14T11:07:26+00:00

Signed-off-by: Rémy Coutable

Project members with guest role can't access confidential issues

2016-06-13T22:32:00+00:00

Fix Error 500 when viewing a blob with binary characters after the 1024-byte mark

2016-06-12T14:36:25+00:00

Here was the problem:

1. When determining whether a given blob is viewable text, gitlab_git reads the first 1024 bytes and checks with Linguist whether it is a text or binary file.
2. If the blob is text, GitLab will attempt to display it.
3. However, if the text has binary characters after the first 1024 bytes, then GitLab will attempt to load the entire contents, but the encoding will be ASCII-8BIT since there are binary characters.
4. The Error 500 results when GitLab attempts to display a mix UTF-8 and ASCII-8BIT.

To fix this, we load as much data as we are willing to display so that the detection will work properly. Requires
an update to gitlab_git: gitlab-org/gitlab_git!86

Closes #13826

Merge branch 'master' into workhorse-helpers

2016-06-10T10:28:04+00:00

Remove require_relative 'import_spec_helper'

2016-06-08T16:18:49+00:00

Move ImportSpecHelper to spec/support/

2016-06-08T15:21:08+00:00

Make Omniauth providers specs to not modify global configuration

2016-06-08T14:50:05+00:00