summaryrefslogtreecommitdiff
path: root/app/views/projects/tree
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2017-07-25 09:18:45 -0400
committerJacob Schatz <jschatz1@gmail.com>2017-07-25 09:18:45 -0400
commit40fd91b876b6a5e3ad79fac60398d1b60d8fb735 (patch)
treeffd9c4f87ab374a45928f027b3eb7b2e4cbea258 /app/views/projects/tree
parentfbacfdb0f0f484cac57b1c5a85f19ef141370c7c (diff)
downloadgitlab-ce-40fd91b876b6a5e3ad79fac60398d1b60d8fb735.tar.gz
Fixes height problems
Diffstat (limited to 'app/views/projects/tree')
-rw-r--r--app/views/projects/tree/_tree_content.html.haml42
-rw-r--r--app/views/projects/tree/_tree_header.html.haml2
2 files changed, 2 insertions, 42 deletions
diff --git a/app/views/projects/tree/_tree_content.html.haml b/app/views/projects/tree/_tree_content.html.haml
index 27bdb7e8b55..5dc5bcc11c1 100644
--- a/app/views/projects/tree/_tree_content.html.haml
+++ b/app/views/projects/tree/_tree_content.html.haml
@@ -1,44 +1,4 @@
-#repo{ data: { url: repo_url(@project), 'project-name' => @project.name } }
- #commit-area{ "v-if" => "changedFiles.length" }
- %form.form-horizontal
- %fieldset
- .form-group
- %label.col-md-4.control-label Staged files ({{changedFiles.length}})
- .col-md-4
- %ul.list-unstyled
- %li{ "v-for" => "file in changedFiles" }
- %span.help-block
- {{file.url}}
- / Textarea
- .form-group
- %label.col-md-4.control-label{ :for => "commit-message" } Commit message
- .col-md-4
- %textarea#commit-message.form-control{ :name => "commit-message" } Updating README.md
- / Button Drop Down
- .form-group
- %label.col-md-4.control-label{ :for => "target-branch" } Target branch
- .col-md-4
- .input-group
- .input-group-btn
- %button.btn.btn-default.dropdown-toggle{ "data-toggle" => "dropdown", :type => "button" }
- Action
- = icon "caret-down"
- %ul.dropdown-menu.pull-right
- %li
- %a{ :href => "#" } Target branch
- %li
- %a{ :href => "#" } Create my own branch
- %input#target-branch.form-control{ :name => "target-branch", :placeholder => "placeholder", :type => "text" }/
- / Multiple Checkboxes
- .form-group
- %label.col-md-4.control-label{ :for => "checkboxes" }
- .col-md-4
- .checkbox
- %label{ :for => "checkboxes-0" }
- %input#checkboxes-0{ :name => "checkboxes", :type => "checkbox", :value => "1" }/
- Start a new merge request with these changes
-
-
+#repo{ data: { url: repo_url(@project), 'project-name' => @project.name, refs_url: refs_namespace_project_path(@project.namespace, @project, format: "json") } }
- if can_edit_tree?
= render 'projects/blob/upload', title: _('Upload New File'), placeholder: _('Upload New File'), button_title: _('Upload file'), form_path: project_create_blob_path(@project, @id), method: :post
diff --git a/app/views/projects/tree/_tree_header.html.haml b/app/views/projects/tree/_tree_header.html.haml
index 970ccbb743d..e28e88921b6 100644
--- a/app/views/projects/tree/_tree_header.html.haml
+++ b/app/views/projects/tree/_tree_header.html.haml
@@ -3,7 +3,7 @@
= render 'shared/ref_switcher', destination: 'tree', path: @path
.tree-controls
- %a.btn.btn-default#editable-mode{ "href"=>"#", "@click.prevent" => "editClicked", "v-cloak" => 1 }
+ %a.btn.btn-default#editable-mode{ "href"=>"#", "@click.prevent" => "editClicked", "v-cloak" => 1, "v-if" => "isCommitable" }
%i{ ":class" => "buttonIcon" }
%span {{buttonLabel}}