diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-01-23 11:02:22 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-01-23 11:02:22 +0000 |
| commit | 3ed8078507b6cb37c7dd85f2fc22c9494faf9e1e (patch) | |
| tree | 21aa75227bf35bc41b31c22f0f26f986e00c0108 /app/views/projects | |
| parent | da251c6436d6e17b18911d37c1b18314fb29329d (diff) | |
| parent | c607b358241712af0d6b442b8e7a277cb6ba8a38 (diff) | |
| download | gitlab-ce-3ed8078507b6cb37c7dd85f2fc22c9494faf9e1e.tar.gz | |
Merge branch '25569-changing-wording-to-delete-when-referring-to-removing-a-branch' into 'master'
Resolve "Changing wording to "Delete" when referring to removing a branch"
Closes #25569
See merge request gitlab-org/gitlab-ce!23966
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/protected_branches/shared/_protected_branch.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/protected_branches/shared/_protected_branch.html.haml b/app/views/projects/protected_branches/shared/_protected_branch.html.haml index 81b07af22ad..bb7998f739d 100644 --- a/app/views/projects/protected_branches/shared/_protected_branch.html.haml +++ b/app/views/projects/protected_branches/shared/_protected_branch.html.haml @@ -15,7 +15,7 @@ = link_to(commit.short_id, namespace_project_commit_path(@project.namespace, @project, commit.id), class: 'commit-sha') = time_ago_with_tooltip(commit.committed_date) - else - (branch was removed from repository) + (branch was deleted from repository) = yield |