diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-12-08 22:04:52 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-12-08 22:04:52 +0000 |
| commit | e6668f8e341e422cae752e3371631b50eeb696b2 (patch) | |
| tree | 428ff5903dbd995082a4e6874aacfbd131a02287 /app/views/projects/tree | |
| parent | 275e8e7309604831485a1f0179f98f41c06f5a8c (diff) | |
| parent | 0f89e6905db6fe821332013e8ddb2707079e0ba4 (diff) | |
| download | gitlab-ce-e6668f8e341e422cae752e3371631b50eeb696b2.tar.gz | |
Merge branch 'edit-in-patch-branch' into 'master'
Default target branch to patch-n when editing file in protected branch
Fixes #3441
See merge request !2021
Diffstat (limited to 'app/views/projects/tree')
| -rw-r--r-- | app/views/projects/tree/_tree_header.html.haml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/views/projects/tree/_tree_header.html.haml b/app/views/projects/tree/_tree_header.html.haml index 12356dbcb6b..0e1f7076608 100644 --- a/app/views/projects/tree/_tree_header.html.haml +++ b/app/views/projects/tree/_tree_header.html.haml @@ -30,3 +30,7 @@ = link_to '#modal-create-new-dir', { 'data-target' => '#modal-create-new-dir', 'data-toggle' => 'modal'} do = icon('folder fw') New directory + - elsif !on_top_of_branch? + %li + %span.btn.add-to-tree.disabled.has_tooltip{title: "You can only add files when you are on a branch.", data: {container: 'body'}} + = icon('plus') |