Commit ec6ea1ee authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'docs-fix-duplicate-titles-ee' into 'master'

Docs: fix duplicate titles

See merge request gitlab-org/gitlab-ee!5581
parents cec53ead 92375d1f
## Configure GitLab using an external PostgreSQL service
# Configure GitLab using an external PostgreSQL service
If you're hosting GitLab on a cloud provider, you can optionally use a
managed service for PostgreSQL. For example, AWS offers a managed Relational
Database Service (RDS) that runs PostgreSQL.
......
# Geo security review (Q&A)
The following security review of the Geo feature set focuses on security
aspects of the feature as they apply to customers running their own GitLab
instances. The review questions are based in part on the [application security architecture](https://www.owasp.org/index.php/Application_Security_Architecture_Cheat_Sheet)
questions from [owasp.org](https://www.owasp.org).
## Business Model
### What geographic areas does the application service?
......@@ -13,8 +13,6 @@ questions from [owasp.org](https://www.owasp.org).
and they get to choose where they are.
- Region and node selection is entirely manual.
## Data Essentials
### What data does the application receive, produce, and process?
......@@ -39,8 +37,6 @@ only less-sensitive projects to be replicated to a secondary if desired.
- Geo is designed to provide replication of a certain subset of the application
data. It is part of the solution, rather than part of the problem.
## End-Users
### Who are the application's end‐users?
......@@ -70,8 +66,6 @@ information on the primary by querying the secondary.
- Attackers must not be able to impersonate the secondary to the primary, and
thus gain access to privileged information.
## Administrators
### Who has administrative capabilities in the application?
......@@ -90,8 +84,6 @@ administrative access.
- The replication process may be controlled (start/stop) via the Sidekiq
administrative controls.
## Network
### What details regarding routing, switching, firewalling, and load‐balancing have been defined?
......@@ -118,8 +110,6 @@ capacity.
geographically separated, it is envisioned that replication traffic will pass
over the public Internet in a typical deployment, but this is not a requirement.
## Systems
### What operating systems support the application?
......@@ -128,7 +118,6 @@ over the public Internet in a typical deployment, but this is not a requirement.
[GitLab installation](https://about.gitlab.com/installation/) page for more
details), however we recommend using the operating systems listed in the [Geo documentation](http://docs.gitlab.com/ee/gitlab-geo/#geo-recommendations).
### What details regarding required OS components and lock‐down needs have been defined?
- The recommended installation method (Omnibus) packages most components itself.
......@@ -144,8 +133,6 @@ https://docs.gitlab.com/ee/gitlab-geo/
situation: security updates to OpenSSH would be provided to the user via the
usual distribution channels. Geo introduces no delay there.
## Infrastructure Monitoring
### What network and system performance monitoring requirements have been defined?
......@@ -160,8 +147,6 @@ https://docs.gitlab.com/ee/gitlab-geo/
- None specific to Geo.
## Virtualization and Externalization
### What aspects of the application lend themselves to virtualization?
......@@ -182,8 +167,6 @@ product. Deployment in clouds is a common and supported scenario.
- To be decided by our customers, according to their operational needs.
## Environment
### What frameworks and programming languages have been used to create the application?
......@@ -210,8 +193,6 @@ The `db_key_base` secret is stored unencrypted on the filesystem, in
`/etc/gitlab/gitlab-secrets.json`, along with a number of other secrets. There is
no at-rest protection for them.
## Data Processing
### What data entry paths does the application support?
......@@ -266,8 +247,6 @@ PostgreSQL.
- Data must have the option to be encrypted in transit, and be secure against
both passive and active attack (e.g., MITM attacks should not be possible).
## Access
### What user privilege levels does the application support?
......@@ -299,8 +278,6 @@ replication proceeds, for instance. This endpoint is only accessible with a JWT
token.
- The primary also makes calls to the secondary to get status information.
## Application Monitoring
### What application auditing requirements have been defined? How are audit and debug logs accessed, stored, and secured?
......
# Project import/export
# Project import/export administration **[CORE ONLY]**
>**Note:**
>
......
# Merge request approvals **[STARTER]**
# Merge request approvals API **[STARTER]**
Configuration for approvals on all Merge Requests (MR) in the project. Must be authenticated for all endpoints.
......
This document was moved to [another location](../../install/openshift_and_gitlab/index.html).
---
redirect_to: '../../install/openshift_and_gitlab/index.html'
---
---
comments: false
redirect_to: 'README.md'
---
# GitLab CI Services
- [Using MySQL](mysql.md)
- [Using PostgreSQL](postgres.md)
- [Using Redis](redis.md)
This document was moved in [user/project/container_registry](../user/project/container_registry.md).
This document was moved to [another location](../user/project/container_registry.md).
---
comments: false
redirect_to: '../user/project/issues/automatic_issue_closing.md'
---
This document was split into:
- [administration/issue_closing_pattern.md](../administration/issue_closing_pattern.md).
- [user/project/issues/automatic_issue_closing](../user/project/issues/automatic_issue_closing.md).
# GitLab Docker images
# Install GitLab with Docker
[Docker](https://www.docker.com) and container technology have been revolutionizing the software world for the past few years. They combine the performance and efficiency of native execution with the abstraction, security, and immutability of virtualization.
......
......@@ -6,7 +6,7 @@ article_type: tutorial
date: 2016-06-28
---
# Getting started with OpenShift Origin 3 and GitLab
# How to install GitLab on OpenShift Origin 3
## Introduction
......
......@@ -4,5 +4,4 @@ comments: false
# Legal
- [Corporate contributor license agreement](corporate_contributor_license_agreement.md)
- [Individual contributor license agreement](individual_contributor_license_agreement.md)
Please read through the [GitLab License Agreement](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md).
This document has been replaced by a Developer Certificate of Origin and License,
as described in [Contributing.md](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md).
\ No newline at end of file
---
redirect_to: 'README.md'
---
This document has been replaced by a Developer Certificate of Origin and License,
as described in [Contributing.md](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md).
\ No newline at end of file
---
redirect_to: 'README.md'
---
# Features
# Namespaces
## Enable usernames and namespaces for user projects
......
# Webhooks
# Webhooks administration **[CORE ONLY]**
## Add a webhook for **ALL** projects:
......
......@@ -2,39 +2,31 @@
comments: false
---
# GitLab Flow
# What is the GitLab Flow
- A simplified branching strategy
- All features and fixes first go to master
- Allows for 'production' or 'stable' branches
- Bug fixes/hot fix patches are cherry-picked from master
---
# Feature branches
## Feature branches
- Create a feature/bugfix branch to do all work
- Use merge requests to merge to master
![inline](gitlab_flow/feature_branches.png)
---
# Production branch
## Production branch
- One, long-running production release branch
as opposed to individual stable branches
- Consider creating a tag for each version that gets deployed
---
# Production branch
## Production branch
![inline](gitlab_flow/production_branch.png)
---
# Release branch
## Release branch
- Useful if you release software to customers
- When preparing a new release, create stable branch
......@@ -43,15 +35,11 @@ comments: false
- Cherry-pick critical bug fixes to stable branch for patch release
- Never commit bug fixes directly to stable branch
---
# Release branch
## Release branch
![inline](gitlab_flow/release_branches.png)
---
# More details
## More details
Blog post on 'GitLab Flow' at
[http://doc.gitlab.com/ee/workflow/gitlab_flow.html](http://doc.gitlab.com/ee/workflow/gitlab_flow.html)
For more information read through the [GitLab Flow](../../workflow/gitlab_flow.md)
documentation.
---
comments: false
redirect_to: '../gitlab_flow.md'
---
# GitLab Flow
----------
- A simplified branching strategy
- All features and fixes first go to master
- Allows for 'production' or 'stable' branches
- Bug fixes/hot fix patches are cherry-picked from master
----------
### Feature branches
- Create a feature/bugfix branch to do all work
- Use merge requests to merge to master
![inline](http://gitlab.com/gitlab-org/University/raw/5baea0fe222a915d0500e40747d35eb18681cdc3/training/gitlab_flow/feature_branches.png)
----------
## Production branch
- One, long-running production release branch
as opposed to individual stable branches
- Consider creating a tag for each version that gets deployed
----------
## Production branch
![inline](http://gitlab.com/gitlab-org/University/raw/5baea0fe222a915d0500e40747d35eb18681cdc3/training/gitlab_flow/production_branch.png)
----------
## Release branch
- Useful if you release software to customers
- When preparing a new release, create stable branch
from master
- Consider creating a tag for each version
- Cherry-pick critical bug fixes to stable branch for patch release
- Never commit bug fixes directly to stable branch
----------
![inline](http://gitlab.com/gitlab-org/University/raw/5baea0fe222a915d0500e40747d35eb18681cdc3/training/gitlab_flow/release_branches.png)
----------
## More details
Blog post on 'GitLab Flow' at
[http://doc.gitlab.com/ee/workflow/gitlab_flow.html](http://doc.gitlab.com/ee/workflow/gitlab_flow.html)
......@@ -2,7 +2,7 @@
comments: false
---
# Merge requests
# Code review and collaboration with Merge Requests
----------
......
# Labels
# Labels administration **[CORE ONLY]**
## Default Labels
......
# GitLab Pages
# Exploring GitLab Pages
> **Notes:**
> - This feature was [introduced][ee-80] in GitLab EE 8.3.
......@@ -14,9 +14,7 @@ deploy static pages for your individual projects, your user or your group.
Read [GitLab Pages on GitLab.com](#gitlab-pages-on-gitlab-com) for specific
information, if you are using GitLab.com to host your website.
Read through [All you Need to Know About GitLab Pages][pages-index-guide] for a list of all learning materials we have prepared for GitLab Pages (webpages, articles, guides, blog posts, video tutorials).
## Getting started with GitLab Pages
## Getting started with GitLab Pages domains
> **Note:**
> In the rest of this document we will assume that the general domain name that
......
......@@ -5,6 +5,7 @@
> - [Introduced][ce-3050] in GitLab 8.9.
> - Importing will not be possible if the import instance version differs from
> that of the exporter.
> - For GitLab admins, please read through [Project import/export administration](../../../administration/raketasks/project_import_export.md).
> - For existing installations, the project import option has to be enabled in
> application settings (`/admin/application_settings`) under 'Import sources'.
> Ask your administrator if you don't see the **GitLab export** button when
......
This document is moved to [user/project/protected_branches.md](../user/project/protected_branches.md)
This document was moved to [another location](../user/project/protected_branches.md).
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment