diff options
| author | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-02-03 17:25:26 +0000 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-02-03 17:25:26 +0000 |
| commit | 1af3f3b673be8f85b37d455b101954e62c2a3add (patch) | |
| tree | 56f09bef2ca41964fae3efaf4f15be7fe1640ba4 /app/views/projects/edit.html.haml | |
| parent | 67c8526033241f6bd190fa16622970b3919e6dbd (diff) | |
| parent | bd8f2b15b3d5267075a626ce86f3a06cc650fcbf (diff) | |
| download | gitlab-ce-1af3f3b673be8f85b37d455b101954e62c2a3add.tar.gz | |
Merge branch 'master' into jej-pages-picked-from-ee
Diffstat (limited to 'app/views/projects/edit.html.haml')
| -rw-r--r-- | app/views/projects/edit.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index dab40d37ead..9c5c1a6d707 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -63,7 +63,7 @@ .row .col-md-9.project-feature.nested - = feature_fields.label :builds_access_level, "Builds", class: 'label-light' + = feature_fields.label :builds_access_level, "Pipelines", class: 'label-light' %span.help-block Submit, test and deploy your changes before merge .col-md-3 = project_feature_access_select(:builds_access_level) @@ -181,13 +181,13 @@ %p The following items will NOT be exported: %ul - %li Build traces and artifacts + %li Job traces and artifacts %li LFS objects %li Container registry images %li CI variables %li Any encrypted tokens - %hr - if can? current_user, :archive_project, @project + %hr .row.prepend-top-default .col-lg-3 %h4.warning-title.prepend-top-0 |