diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-02-10 22:10:50 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-02-10 22:10:50 +0000 |
| commit | 3a30767121e25f11fd40716e8e93a6307a9ac44b (patch) | |
| tree | e50ab17d61edfff9d6be284d2ba0ee2f8ce06bf1 /app/views/projects/triggers/_index.html.haml | |
| parent | 86558d53ddcf008fff396d25c38c9462fb77f615 (diff) | |
| parent | 58131ac93c2a7c784c8c4f9025ef250eac4e1fa1 (diff) | |
| download | gitlab-ce-3a30767121e25f11fd40716e8e93a6307a9ac44b.tar.gz | |
Merge branch 'master' into 27932-merge-request-pipelines-displays-json27932-merge-request-pipelines-displays-json
* master:
Revert "Merge branch 'add-additional-checks-to-ca-data' into 'master'
"
Fix broken test to use trigger in order to not take tooltip overlaping in consideration
Fix job to pipeline renaming
Replace teaspoon references with Karma
Add changelog
Only show MR widget graph if there are stages
Fix tooltip scss for anchors. Adds css for button's tooltips to have similar behavior. Removes padding from mini graph table cell to guarantee stages don't break line on hover
moved hyperlink reference section at the end of the content
adds changelog
fixes frontend doc broken link
Diffstat (limited to 'app/views/projects/triggers/_index.html.haml')
| -rw-r--r-- | app/views/projects/triggers/_index.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/triggers/_index.html.haml b/app/views/projects/triggers/_index.html.haml index 5cb1818ae54..33883facf9b 100644 --- a/app/views/projects/triggers/_index.html.haml +++ b/app/views/projects/triggers/_index.html.haml @@ -65,7 +65,7 @@ In the %code .gitlab-ci.yml of another project, include the following snippet. - The project will be rebuilt at the end of the job. + The project will be rebuilt at the end of the pipeline. %pre :plain @@ -89,7 +89,7 @@ %p.light Add %code variables[VARIABLE]=VALUE - to an API request. Variable values can be used to distinguish between triggered jobs and normal jobs. + to an API request. Variable values can be used to distinguish between triggered pipelines and normal pipelines. With cURL: |