Skip to content

G
gitlab-ce
Commit f9c7d650 authored by Lukas Eipert's avatar Lukas Eipert
Browse files
Options

resolve conflict in doc/ci/variables/where_variables_can_be_used.md

parent fa9f94cc
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
doc/ci/variables/where_variables_can_be_used.md
View file @ f9c7d650
...@@ -110,7 +110,6 @@ They are: ...@@ -110,7 +110,6 @@ They are:
- **Not supported:** - **Not supported:**
- By the definitions [described in the table](#gitlab-ci-yml-file) where the "Expansion place" is "GitLab". - By the definitions [described in the table](#gitlab-ci-yml-file) where the "Expansion place" is "GitLab".
- In the `only` and `except` [variables expressions](README.md#variables-expressions). - In the `only` and `except` [variables expressions](README.md#variables-expressions).
<<<<<<< HEAD
## Variables with an environment scope ## Variables with an environment scope
...@@ -130,5 +129,3 @@ my-job: ...@@ -130,5 +129,3 @@ my-job:
variables: variables:
- $STAGING_SECRET == 'something' - $STAGING_SECRET == 'something'
``` ```
=======
>>>>>>> upstream/master
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