delta/gitlab/gitlab-ce.git/lib, branch feature/github-edit-path

modify github import JS and controller so we can now specify a namespace and/or name for a project.

2016-09-20T08:14:39+00:00

- Fixed and added specs.
- Added different namespace options depending on user privilages
- Updated docs.

Merge branch 'rs-trailing-spaces-in-regex-messages' into 'master'

2016-09-20T07:23:18+00:00


Remove trailing spaces from messages in Gitlab::Regex

See merge request !6426

Merge branch 'ldap_user_attr_method' into 'master'

2016-09-20T05:52:39+00:00


Move LDAP user attributes to a method

## What does this MR do?

This is a change that supports an EE fix. This small change needs to be made in CE to prevent future merge conflicts. 
See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/736 for the EE changes.

See merge request !6377

Merge branch 'strip-key-comments-for-gitlab-shell' into 'master'

2016-09-20T05:42:03+00:00


Strip comments before sending keys to gitlab-shell

## Why was this MR needed?

https://gitlab.com/gitlab-org/gitlab-ce/issues/22167 encoding issues in comment text.

## What are the relevant issue numbers?

https://gitlab.com/gitlab-org/gitlab-ce/issues/22167

See merge request !6381

Merge branch '22065-group-members-api-returning-null-user-details' into 'master'

2016-09-20T05:20:47+00:00


Ensure invitees are not returned in Members API

## What are the relevant issue numbers?

Closes #22065

See merge request !6370

Remove trailing spaces from messages in Gitlab::Regex

2016-09-20T04:20:48+00:00

Merge branch 'issue_20978' into 'master'

2016-09-19T15:53:40+00:00


Allow to set request_access_enabled for groups and projects using API

Closes #20978

See merge request !6359

Allow to set request_access_enabled for groups and projects using API

2016-09-19T15:13:57+00:00

Merge branch 'per-build-token-without-lfs' into 'master'

2016-09-19T13:36:54+00:00


Make CI to use the permission of the user who is trigger the build

This is continuation of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5735, but with removed all LFS code that is added by: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043.

This also incorporates most of LFS code added in !6043 to simplify further merge.

See merge request !6409

Merge branch 'fix/import-export-db-errors' into 'master'

2016-09-19T13:02:49+00:00


Fix import/export database errors

Fixes protected branches errors when importing a project including them

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21295

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21799

See merge request !6099