diff options
| author | Constance Okoghenun <cokoghenun@gitlab.com> | 2018-01-11 16:27:30 +0100 |
|---|---|---|
| committer | Constance Okoghenun <cokoghenun@gitlab.com> | 2018-01-11 16:27:30 +0100 |
| commit | 0fe784cbfb56a701259d83c989341afb1b7bc124 (patch) | |
| tree | 099ec5f39984c031b2403f75b1958be93e46d882 /app/assets/javascripts/ide/components/ide_project_branches_tree.vue | |
| parent | 7d0a1285a10fcb4735c20e21d83367159402a06d (diff) | |
| parent | 27732df37178c3a07c99304406dfdb41fa8b3670 (diff) | |
| download | gitlab-ce-0fe784cbfb56a701259d83c989341afb1b7bc124.tar.gz | |
Resolved conflicts in dispatcher.jshelp-profiles-dispatcher-refactor
Diffstat (limited to 'app/assets/javascripts/ide/components/ide_project_branches_tree.vue')
| -rw-r--r-- | app/assets/javascripts/ide/components/ide_project_branches_tree.vue | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/ide/components/ide_project_branches_tree.vue b/app/assets/javascripts/ide/components/ide_project_branches_tree.vue index bd3a521ff43..af2f7341a91 100644 --- a/app/assets/javascripts/ide/components/ide_project_branches_tree.vue +++ b/app/assets/javascripts/ide/components/ide_project_branches_tree.vue @@ -28,20 +28,20 @@ export default { <div class="branch-header-title"> <icon name="branch" - :size="12"> - </icon> + :size="12" + /> {{ branch.name }} </div> <div class="branch-header-btns"> <new-dropdown :project-id="projectId" :branch="branch.name" - path=""/> + path="" + /> </div> </div> <div> - <repo-tree - :treeId="branch.treeId"/> + <repo-tree :tree-id="branch.treeId" /> </div> </div> </template> |