Commit 1983e159 authored by Marcia Ramos's avatar Marcia Ramos 🌴 Committed by Achilleas Pipinellis

Docs: fix duplicate titles

parent 88c02d9e
# 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.
Alternatively, you may opt to manage your own PostgreSQL instance or cluster
separate from the GitLab Omnibus package.
If you use a cloud-managed service, or provide your own PostgreSQL instance:
1. Setup PostgreSQL according to the
[database requirements document](../install/requirements.md#database).
1. Set up a `gitlab` username with a password of your choice. The `gitlab` user
needs privileges to create the `gitlabhq_production` database.
1. Configure the GitLab application servers with the appropriate details.
This step is covered in [Configuring GitLab for HA](high_availability/gitlab.md).
# Project import/export # Project import/export administration **[CORE ONLY]**
>**Note:** >**Note:**
> >
......
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. [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 ...@@ -6,7 +6,7 @@ article_type: tutorial
date: 2016-06-28 date: 2016-06-28
--- ---
# Getting started with OpenShift Origin 3 and GitLab # How to install GitLab on OpenShift Origin 3
## Introduction ## Introduction
......
...@@ -4,5 +4,4 @@ comments: false ...@@ -4,5 +4,4 @@ comments: false
# Legal # Legal
- [Corporate contributor license agreement](corporate_contributor_license_agreement.md) Please read through the [GitLab License Agreement](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md).
- [Individual contributor license agreement](individual_contributor_license_agreement.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). redirect_to: 'README.md'
\ No newline at end of file ---
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). redirect_to: 'README.md'
\ No newline at end of file ---
# Features # Namespaces
## Enable usernames and namespaces for user projects ## Enable usernames and namespaces for user projects
......
# Webhooks # Webhooks administration **[CORE ONLY]**
## Add a webhook for **ALL** projects: ## Add a webhook for **ALL** projects:
......
...@@ -2,39 +2,31 @@ ...@@ -2,39 +2,31 @@
comments: false comments: false
--- ---
# GitLab Flow # What is the GitLab Flow
- A simplified branching strategy - A simplified branching strategy
- All features and fixes first go to master - All features and fixes first go to master
- Allows for 'production' or 'stable' branches - Allows for 'production' or 'stable' branches
- Bug fixes/hot fix patches are cherry-picked from master - Bug fixes/hot fix patches are cherry-picked from master
--- ## Feature branches
# Feature branches
- Create a feature/bugfix branch to do all work - Create a feature/bugfix branch to do all work
- Use merge requests to merge to master - Use merge requests to merge to master
![inline](gitlab_flow/feature_branches.png) ![inline](gitlab_flow/feature_branches.png)
--- ## Production branch
# Production branch
- One, long-running production release branch - One, long-running production release branch
as opposed to individual stable branches as opposed to individual stable branches
- Consider creating a tag for each version that gets deployed - Consider creating a tag for each version that gets deployed
--- ## Production branch
# Production branch
![inline](gitlab_flow/production_branch.png) ![inline](gitlab_flow/production_branch.png)
--- ## Release branch
# Release branch
- Useful if you release software to customers - Useful if you release software to customers
- When preparing a new release, create stable branch - When preparing a new release, create stable branch
...@@ -43,15 +35,11 @@ comments: false ...@@ -43,15 +35,11 @@ comments: false
- Cherry-pick critical bug fixes to stable branch for patch release - Cherry-pick critical bug fixes to stable branch for patch release
- Never commit bug fixes directly to stable branch - Never commit bug fixes directly to stable branch
--- ## Release branch
# Release branch
![inline](gitlab_flow/release_branches.png) ![inline](gitlab_flow/release_branches.png)
--- ## More details
# More details
Blog post on 'GitLab Flow' at For more information read through the [GitLab Flow](../../workflow/gitlab_flow.md)
[http://doc.gitlab.com/ee/workflow/gitlab_flow.html](http://doc.gitlab.com/ee/workflow/gitlab_flow.html) 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 @@ ...@@ -2,7 +2,7 @@
comments: false comments: false
--- ---
# Merge requests # Code review and collaboration with Merge Requests
---------- ----------
......
# Labels # Labels administration **[CORE ONLY]**
## Default Labels ## Default Labels
......
# GitLab Pages # Exploring GitLab Pages
> **Notes:** > **Notes:**
> - This feature was [introduced][ee-80] in GitLab EE 8.3. > - 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. ...@@ -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 Read [GitLab Pages on GitLab.com](#gitlab-pages-on-gitlab-com) for specific
information, if you are using GitLab.com to host your website. 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 domains
## Getting started with GitLab Pages
> **Note:** > **Note:**
> In the rest of this document we will assume that the general domain name that > In the rest of this document we will assume that the general domain name that
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
> - [Introduced][ce-3050] in GitLab 8.9. > - [Introduced][ce-3050] in GitLab 8.9.
> - Importing will not be possible if the import instance version differs from > - Importing will not be possible if the import instance version differs from
> that of the exporter. > 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 > - For existing installations, the project import option has to be enabled in
> application settings (`/admin/application_settings`) under 'Import sources'. > application settings (`/admin/application_settings`) under 'Import sources'.
> Ask your administrator if you don't see the **GitLab export** button when > 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