diff options
-rw-r--r-- | doc/user/profile/account/index.md | 68 | ||||
-rw-r--r-- | doc/user/project/img/project_view_numbered.png | bin | 143686 -> 0 bytes | |||
-rw-r--r-- | doc/user/project/index.md | 187 | ||||
-rw-r--r-- | doc/user/project/issues/issues_functionalities.md | 6 | ||||
-rw-r--r-- | doc/user/repository/index.md | 12 |
5 files changed, 7 insertions, 266 deletions
diff --git a/doc/user/profile/account/index.md b/doc/user/profile/account/index.md index 35937d41431..990a36a14e7 100644 --- a/doc/user/profile/account/index.md +++ b/doc/user/profile/account/index.md @@ -1,70 +1,8 @@ # User account +## Account + When logged into their GitLab account, users can customize their experience according to the best approach to their cases. -## User profile - -Your profile is available from the up-right corner menu bar (user's avatar) > **Profile**, -or from `https://gitlab.com/username`. - -- Activity streamline: see your activity streamline and the history of your contributions -- Groups: groups you're a member of -- Contributed projects: projects you contributed to -- Personal projects: your personal projects (respecting the project's visibility level) -- Snippets: personal code [snippets](snippets.md#personal-snippets) - -## Profile settings - -You can edit your account settings by navigating from the up-right corner menu bar -(user's avatar) > **Settings**, or visiting `https://gitlab.com/profile`. - -- Profile: User profile - - Avatar - - User info - - Name - - Email - - Public email - - Preferred language - - Social network profiles (Twitter, LinkedIn, Skype) - - Website - - Location - - Organization - - Bio -- Account: Manage your account - - Private tokens - - Incoming Email tokens - - Enable [Two-Factor-Authentication](two_factor_autherntication.md) (2FA) - - Social sign-in - - Change username - - Remove account -- Applications: Manage applications that can -[use GitLab as an OAuth provider](../integration/oauth_provider.md#introduction-to-oauth), - - Add new - - Scopes - - Your applications - - Authorized applications -- Chat: see your chat accounts -- Access tokens: Manage tokens to access your account via API and authorized applications - - Personal access token - - Add a new personal access token - - Active personal access tokens - - Inactive personal access tokens -- Emails: Add and delete emails linked to your account -- Password: Change your password -- Notifications: Specify notification levels per group or per project - - [Global notification settings](../workflow/notifications.md#notification-settings) - - Notification email - - Notification about own activity - - Global notification level - - Change notifications per group - - Change notifications per project -- SSH Keys: Manage [SSH keys](../ssh/README.md#ssh) to access your account via SSH - - Add SSH keys - - Delete SSH keys -- [Preferences](profile/preferences.md#syntax-highlighting-theme): Customize your GitLab experience - - Syntax highlighting themes - - Layout behavior - - Default dashboard - - Project view -- Audit log: A security log of important events involving your account +Set up [two-factor authentication](two_factor_authentication.md). diff --git a/doc/user/project/img/project_view_numbered.png b/doc/user/project/img/project_view_numbered.png Binary files differdeleted file mode 100644 index 408681b1645..00000000000 --- a/doc/user/project/img/project_view_numbered.png +++ /dev/null diff --git a/doc/user/project/index.md b/doc/user/project/index.md deleted file mode 100644 index 2d8dea709a3..00000000000 --- a/doc/user/project/index.md +++ /dev/null @@ -1,187 +0,0 @@ -# Project - -A **GitLab Project** is a complete tool for project -management **with** version control **and** continuous methods. - -## Project's features - -Your work in GitLab starts with a project. From there, -you can, for example, use it as an Issue Tracker, create code snippets, or -host your code with version control in a Git-based platform. - -Beyond hosting your code, with GitLab Projects you can, among other powerful [features](): - -- Discuss implementations with your team with [GitLab Issues](issues/index.md) - - Discuss privately with [Confidential Issues](issues/confidential_issues.md) -- Plan ahead, organize, collaborate - - Organize issues and merge requests by giving them [Labels](labels.md) - - Manage your workflow and prioritize issues with [Issue Boards](issue_board.md) - - Enhance the workflow capability of Issue Boards with [Multiple Issue Boards]() (EES/EEP) - - [Assign]() issues and merge requests to a team member or to [multiple people]() - - Use [Time Tracking](../../workflow/time_tracking.md) to track estimate time and time spent on - the conclusion of an issue or merge request - - Work towards a target date with [Milestones](milestones/index.md) -- Host your code in repositories with [Git](../../topics/git/index.md) version control - - Easily apply Git commands from the UI - - [Revert]() - - [Cherry-pick]() - - Manage [branches]() - - [Squash and merge]() -- Push code with [Merge Requests]() - - [Merge Request Approvals]() - - [Fix merge conflicts from the UI]() -- Preview the results of the changes proposed in a merge request - in a per-branch basis with [Review Apps]() -- Built-in [Continuous Integration, Delivery, and Deployment]() with [GitLab CI]() - - Browse and download [job artifacts]() - - [Environments]() - - [Auto Deploy]() - - Visualize the CI flow with Pipelines - - [Scheduled Pipelines]() - - [Pipeline Charts]() -- Review the development lifecycle with [Cycle Analytics](cycle_analytics.md) - -## Project's dashboard - -Every project in GitLab has powerful built-in features, accessed from the project's dashboard. - -Access your project's dashboard (project's home page) under `https://gitlab.com/namespace/project-name`. - -The project's dashboard displays the following information: - -![project's dashboard screenshot](img/project_view_numbered.png) - -From the project's dashboard, you have access to the following information: - -### 1. Project's name - -This is the first information found on the left screen: - -- User/group name -- Project's name - -The username or groupname are called `namespaces`, which can be changed -from the project's settings. - -When you create a new project, you'll be prompted to choose which namespace -you'd like to create your project under. - -### 2. Search bar - -Use the search bar to search through issues and merge -requests assigned to you within the project - -### 3. Project's features bar - -Navigate through the project's [features and settings](#project-39-s-features). - -- [Repository](repository/index.md) - - Files - - Commits - - Branches - - Tags (manage tags, release notes, changelog) - - Contributors (project's members contributions) - - Graph (Git revision graph) - - Compare (compare branches) - - Charts (Programming languages, commit statistics) - - Locked Files (EEP) -- [Registry]() (Container Registry settings) -- [Issues](issues/index.md) - - Tracker (list of issues) - - [Issue Boards]() - - [Labels]() - - [Milestones]() -- [Merge Requests](merge_requests/index.md) -- [Pipelines]() - - Pipelines - - [Jobs]() - - [Schedules]() - - [Environments]() - - [Charts]() -- [Wiki]() -- [Snippets]() -- [Settings]() - - General - - Members - -[Integrations (Services) - - Repository - - Pipelines - - Pages - - Audit Events - -### 4. Project's activity - -- Access the project's homepage -- View the projects' members activity -- View [Cycle Analytics]() - -### 5. Project's description - -- Project's avatar -- Project's title (name) -- Project's description - -To adjust these entries, from the project's dashboard, navigate to **Settings**. - -### 6. Project's details - -- Project's popularity (number of forks and stars) -- Path (https or [SSH]()) to access the project remotely -- Link to download the project's default branch (available in `zip`, `tar.gz`, `tar.bz2`, `tar`) -- Shortcut `+` button: add a new issue, new merge request, new file, new branch or new tag -- Project's [notifications]() level - -### 7. Leave project - -**Leave project** will only display when a project is part of a group. -If you choose to leave a project you will no longer be a project member, -therefore, unable to contribute. - -### 8. Repository details - -- Project's size (bytes), number of commits, branches, and tags -- Files - - Continuous Integration (GitLab CI configuration): a link to `.gitlab-ci.yml` (or to add a new one) - - Changelog: a link to `CHANGELOG` (or to add a new one) - - License: a link to `LICENSE` (or to add a new one) - - Contribution guide: a link to `CONTRIBUTING.md` (or to add a new one) -- Latest commit and pipeline status (if GitLab CI is configured) - -### 9. Branches - -- Branch dropdown menu -- Shortcuts: - - Plus sign `+`: add new file, upload file, new directory, new branch, or new tag - -### 10. Search, download - -- Find file: search though the project's files -- View commit history -- Download the project (a chosen branch, available in `zip`, `tar.gz`, `tar.bz2`, `tar`) - -### 11. Latest commit - -Displays the latest commit pushed to the project, together with its author and its date/time. - -### 12. Files - -Displays the files in alphabetical order, besides the last commit for each file, and the time/date it was pushed to the repository. - -## New project - -Learn how to create a new project in GitLab - -## Fork a project - -- Collaborate on code by forking a project and creating a merge request from your fork to the upstream project -- Fork a sample project to work on the top of that - -## Import or Export a project - -- Import a project from: - - [GitHub to GitLab](../workflow/importing/import_projects_from_github.md) - - [BitBucket to GitLab](../workflow/importing/import_projects_from_bitbucket.md) - - [Gitea to GitLab](../workflow/importing/import_projects_from_gitea.md - - [FogBugz to GitLab](../workflow/importing/import_projects_from_fogbugz.md) -- [Export a project from GitLab](project/settings/import_export.md#exporting-a-project-and-its-data) - diff --git a/doc/user/project/issues/issues_functionalities.md b/doc/user/project/issues/issues_functionalities.md index 29def434544..294176e61f9 100644 --- a/doc/user/project/issues/issues_functionalities.md +++ b/doc/user/project/issues/issues_functionalities.md @@ -60,7 +60,9 @@ in [GitLab Enterprise Edition 9.2](https://about.gitlab.com/2017/05/22/gitlab-9- - Select a [milestone](../milestones/index.md) to attribute that issue to. -#### 5. Time Tracking +#### 5. Time Tracking (EES/EEP) + +This feature is available only in [GitLab Enterprise Edition](https://about.gitlab.com/gitlab-ee/). - Estimate time: add an estimate time in which the issue will be implemented - Spend: add the time spent on the implementation of that issue @@ -68,7 +70,7 @@ in [GitLab Enterprise Edition 9.2](https://about.gitlab.com/2017/05/22/gitlab-9- > **Note:** both estimate and spend times are set via [GitLab Quick Actions](../quick_actions.md). -Learn more on the [Time Tracking documentation](../../../workflow/time_tracking.html). +Learn more on the [Time Tracking documentation](https://docs.gitlab.com/ee/workflow/time_tracking.html). #### 6. Due date diff --git a/doc/user/repository/index.md b/doc/user/repository/index.md deleted file mode 100644 index 1dba53e83b8..00000000000 --- a/doc/user/repository/index.md +++ /dev/null @@ -1,12 +0,0 @@ -# Repository - -- Files -- Commits -- Branches -- Tags -- Contributors -- Graph -- Compare -- Charts -- Locked files (EE-only) - |