diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-08-11 06:59:17 +0000 |
|---|---|---|
| committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-08-16 17:23:23 +0200 |
| commit | 421dbfade101e3058b13979eeb3cf1a66b7c18e7 (patch) | |
| tree | 0f3e8a7e99fcc97878fcda89291c874a81b41b58 /app/views/projects/edit.html.haml | |
| parent | 802a0ecf87df12796d2e92b63d8c87b38aff0d5d (diff) | |
| download | gitlab-ce-421dbfade101e3058b13979eeb3cf1a66b7c18e7.tar.gz | |
Merge branch 'fix-typos' into 'master'
Fix minor typos in views
Closes #36317
See merge request !13487
Diffstat (limited to 'app/views/projects/edit.html.haml')
| -rw-r--r-- | app/views/projects/edit.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index 20fceda26dc..c2794f8aaa8 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -205,7 +205,7 @@ %button.btn.js-settings-toggle = expanded ? 'Collapse' : 'Expand' %p - Perform advanced options such as housekeeping, exporting, archiveing, renameing, transfering, or removeing your project. + Perform advanced options such as housekeeping, exporting, archiving, renaming, transferring, or removing your project. .settings-content.no-animate{ class: ('expanded' if expanded) } .sub-section %h4 Housekeeping @@ -274,7 +274,7 @@ %li Be careful. Changing the project's namespace can have unintended side effects. %li You can only transfer the project to namespaces you manage. %li You will need to update your local repositories to point to the new location. - %li Project visibility level will be changed to match namespace rules when transfering to a group. + %li Project visibility level will be changed to match namespace rules when transferring to a group. = f.submit 'Transfer project', class: "btn btn-remove js-confirm-danger", data: { "confirm-danger-message" => transfer_project_message(@project) } - if @project.forked? && can?(current_user, :remove_fork_project, @project) .sub-section |