kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss

History

Douwe Maan 4d64a32c88 Merge branch 'feature/ldap-sync-edgecases' into 'master' LDAP Sync blocked user edgecases Allow GitLab admins to block otherwise valid GitLab LDAP users (https://gitlab.com/gitlab-org/gitlab-ce/issues/3462) Based on the discussion on the original issue, we are going to differentiate "normal" block operations to the ldap automatic ones in order to make some decisions when its one or the other. Expected behavior: - [x] "ldap_blocked" users respond to both `blocked?` and `ldap_blocked?` - [x] "ldap_blocked" users can't be unblocked by the Admin UI - [x] "ldap_blocked" users can't be unblocked by the API - [x] Block operations that are originated from LDAP synchronization will flag user as "ldap_blocked" - [x] Only "ldap_blocked" users will be automatically unblocked by LDAP synchronization - [x] When LDAP identity is removed, we should convert `ldap_blocked` into `blocked` Mockup for the Admin UI with both "ldap_blocked" and normal "blocked" users: ![image](/uploads/4f56fc17b73cb2c9e2a154a22e7ad291/image.png) There will be another MR for the EE version. See merge request !2242		2016-01-14 11:00:08 +00:00
..
administration	Merge remote-tracking branch 'origin/crosslink-env-docs'	2016-01-05 10:36:35 +01:00
api	Merge branch 'feature/ldap-sync-edgecases' into 'master'	2016-01-14 11:00:08 +00:00
ci	[ci skip] Fixed minor typo in docker documentation	2016-01-11 10:02:39 -07:00
customization	Update documentation about automatic issue closing	2015-12-07 14:11:13 +01:00
development	Update doc_styleguide.md [ci skip]	2016-01-13 18:24:08 +01:00
gitlab-basics	Merge branch 'create-issue' into 'master'	2015-10-01 16:29:29 +00:00
hooks	Rewrite HTTP links to force TLS, where possible	2015-11-16 16:50:05 -08:00
incoming_email	Make Reply by email easier to configure	2015-10-13 13:10:49 +02:00
install	Update to Go 1.5.3	2016-01-13 17:21:37 -08:00
integration	Never heard of gitlab-omnibus	2016-01-12 14:47:55 +01:00
legal	Rewrite HTTP links to force TLS, where possible	2015-11-16 16:50:05 -08:00
logs	Revert "Merge branch 'revert-satellites' into 'master' "	2015-08-11 14:33:31 +02:00
markdown	Rewrite HTTP links to force TLS, where possible	2015-11-16 16:50:05 -08:00
migrate_ci_to_ce	Update ci to ce doc to make it clearer when you are done if you don't want to keep your data.	2015-10-05 16:39:58 +02:00
operations	Add 'resume' capability to parallel-rsync-repos	2015-12-08 15:08:22 +01:00
permissions	Fix broken link in permissions page [ci skip]	2015-12-28 23:06:58 +02:00
profile	added note about backing up recovery codes	2015-08-18 15:56:38 -07:00
project_services	Split external issue tracker document	2016-01-08 12:43:33 +01:00
public_access	Update public access documentation [ci skip]	2015-11-19 17:24:10 +02:00
raketasks	docs: raketasks: Add documentation on uploading to mounted shares	2015-12-29 21:19:15 -05:00
release	Never heard of gitlab-omnibus	2016-01-12 14:47:55 +01:00
security	Clean up CRIME security doc [ci skip]	2015-12-25 15:23:06 +02:00
ssh	Fix grammar	2016-01-05 13:06:23 +01:00
system_hooks	Include user_username in user_(add_to/remove_from)_(project/group) system hooks.	2016-01-07 12:54:54 -05:00
update	Prepare Installation and Update docs for 8.4 RC1	2016-01-12 18:04:02 -05:00
web_hooks	Merge pull request #9850 from davydovanton/doc-fix-typos	2015-12-10 14:30:24 -08:00
workflow	Clean up document on adding users to a project	2016-01-09 11:03:10 +01:00
README.md	Move doc_styleguide in the development directory	2016-01-12 11:57:42 +01:00

README.md

Documentation

User documentation

API Automate GitLab via a simple and powerful API.
GitLab as OAuth2 authentication service provider. It allows you to login to other applications from GitLab.
GitLab Basics Find step by step how to start working on your commandline and on GitLab.
Importing to GitLab.
Markdown GitLab's advanced formatting system.
Migrating from SVN Convert a SVN repository to Git and GitLab
Permissions Learn what each role in a project (guest/reporter/developer/master/owner) can do.
Profile Settings
Project Services Integrate a project with external services, such as CI and chat.
Public access Learn how you can allow public and internal access to projects.
SSH Setup your ssh keys and deploy keys for secure access to your projects.
Web hooks Let GitLab notify you when new code has been pushed to your project.
Workflow Using GitLab functionality and importing projects from GitHub and SVN.

CI Documentation

CI Languages

Testing PHP

CI Services

CI Examples

Test and deploy Ruby applications to Heroku
Test and deploy Python applications to Heroku
Test Clojure applications
Help your favorite programming language and GitLab by sending a merge request with a guide for that language.

Administrator documentation

Custom git hooks Custom git hooks (on the filesystem) for when web hooks aren't enough.
Install Requirements, directory structures and installation from source.
Integration How to integrate with systems such as JIRA, Redmine, LDAP and Twitter.
Issue closing Customize how to close an issue from commit messages.
Libravatar Use Libravatar for user avatars.
Log system Log system.
Environment Variables to configure GitLab.
Operations Keeping GitLab up and running
Raketasks Backups, maintenance, automatic web hook setup and the importing of projects.
Security Learn what you can do to further secure your GitLab instance.
System hooks Notifications when users, projects and keys are changed.
Update Update guides to upgrade your installation.
Welcome message Add a custom welcome message to the sign-in page.
Reply by email Allow users to comment on issues and merge requests by replying to notification emails.
Migrate GitLab CI to CE/EE Follow this guide to migrate your existing GitLab CI data to GitLab CE/EE.
Git LFS configuration

Contributor documentation

Documentation styleguide Use this styleguide if you are contributing to documentation.
Development Explains the architecture and the guidelines for shell commands.
Legal Contributor license agreements.
Release How to make the monthly and security releases.