Skip to content

G
gitlab-ce
Commit b4c2ab99 authored by Stan Hu's avatar Stan Hu
Browse files
Options

Resolve more conflicts in doc/ci/variables/README.md

parent 5c29be3a
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
doc/ci/variables/README.md
View file @ b4c2ab99
...@@ -119,10 +119,7 @@ future GitLab releases.** ...@@ -119,10 +119,7 @@ future GitLab releases.**
| **GITLAB_USER_ID** | 8.12 | all | The id of the user who started the job | | **GITLAB_USER_ID** | 8.12 | all | The id of the user who started the job |
| **GITLAB_USER_LOGIN** | 10.0 | all | The login username of the user who started the job | | **GITLAB_USER_LOGIN** | 10.0 | all | The login username of the user who started the job |
| **GITLAB_USER_NAME** | 10.0 | all | The real name of the user who started the job | | **GITLAB_USER_NAME** | 10.0 | all | The real name of the user who started the job |
<<<<<<< HEAD
| **GITLAB_FEATURES** | 10.6 | all | The comma separated list of licensed features available for your instance and plan | | **GITLAB_FEATURES** | 10.6 | all | The comma separated list of licensed features available for your instance and plan |
=======
>>>>>>> upstream/master
| **RESTORE_CACHE_ATTEMPTS** | 8.15 | 1.9 | Number of attempts to restore the cache running a job | | **RESTORE_CACHE_ATTEMPTS** | 8.15 | 1.9 | Number of attempts to restore the cache running a job |
## GitLab 9.0 renaming ## GitLab 9.0 renaming
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7