diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-05 12:08:43 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-05 12:08:43 +0300 |
| commit | 26384c9a61da9922b8fa4b8351d4e42d51661b37 (patch) | |
| tree | ef3decbed644db3c97dcdbb5b71d4ade77f3155d /app/assets/javascripts/ide | |
| parent | 79cbe31b18159ea394c6f6e3027c1dc69bdabb75 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/ide')
| -rw-r--r-- | app/assets/javascripts/ide/components/nav_form.vue | 8 | ||||
| -rw-r--r-- | app/assets/javascripts/ide/components/new_dropdown/index.vue | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/ide/components/nav_form.vue b/app/assets/javascripts/ide/components/nav_form.vue index 23c068f329d..2ccc84ea5d5 100644 --- a/app/assets/javascripts/ide/components/nav_form.vue +++ b/app/assets/javascripts/ide/components/nav_form.vue @@ -19,15 +19,15 @@ export default { <tabs stop-propagation> <tab active> <template slot="title"> - {{ __('Merge Requests') }} + {{ __('Branches') }} </template> - <merge-request-search-list /> + <branches-search-list /> </tab> <tab> <template slot="title"> - {{ __('Branches') }} + {{ __('Merge Requests') }} </template> - <branches-search-list /> + <merge-request-search-list /> </tab> </tabs> </div> diff --git a/app/assets/javascripts/ide/components/new_dropdown/index.vue b/app/assets/javascripts/ide/components/new_dropdown/index.vue index bcaaa8e09c2..b2fa020fb00 100644 --- a/app/assets/javascripts/ide/components/new_dropdown/index.vue +++ b/app/assets/javascripts/ide/components/new_dropdown/index.vue @@ -51,7 +51,7 @@ export default { </script> <template> - <div class="ide-new-btn d-none"> + <div class="ide-new-btn"> <div :class="{ show: isOpen, |