diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-04-20 00:37:44 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-04-20 00:37:44 +0000 |
| commit | d170133bded904603833f1b9e2727def3805962d (patch) | |
| tree | a1c1e1f9973b43a5ff2482d4e1b91b219c5ac3af /app/views/projects/blob/edit.html.haml | |
| parent | bfb635a4afea60751a44e6454f9c36850b5342c9 (diff) | |
| download | gitlab-ce-d170133bded904603833f1b9e2727def3805962d.tar.gz | |
Refactor changing files in web UI
Diffstat (limited to 'app/views/projects/blob/edit.html.haml')
| -rw-r--r-- | app/views/projects/blob/edit.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/blob/edit.html.haml b/app/views/projects/blob/edit.html.haml index 4b26f944733..4af62461151 100644 --- a/app/views/projects/blob/edit.html.haml +++ b/app/views/projects/blob/edit.html.haml @@ -9,7 +9,7 @@ - if @conflict .alert.alert-danger Someone edited the file the same time you did. Please check out - = link_to "the file", namespace_project_blob_path(@project.namespace, @project, tree_join(@target_branch, @file_path)), target: "_blank", rel: 'noopener noreferrer' + = link_to "the file", namespace_project_blob_path(@project.namespace, @project, tree_join(@branch_name, @file_path)), target: "_blank", rel: 'noopener noreferrer' and make sure your changes will not unintentionally remove theirs. .editor-title-row %h3.page-title.blob-edit-page-title |