diff options
| author | Phil Hughes <me@iamphill.com> | 2018-07-25 13:00:23 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-07-25 13:00:23 +0100 |
| commit | a3ee9df5d17787c2ca2448b6bff154c3d38d40ac (patch) | |
| tree | be731ef383a6fafa747988837d01b843e6404208 | |
| parent | d1e939ed94c9b7e8664563a3824a8590f04ffb0e (diff) | |
| download | gitlab-ce-ide-rename-files.tar.gz | |
fixed specside-rename-files
| -rw-r--r-- | app/assets/javascripts/ide/components/new_dropdown/index.vue | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/ide/components/repo_file.vue | 2 | ||||
| -rw-r--r-- | locale/gitlab.pot | 8 | ||||
| -rw-r--r-- | spec/javascripts/ide/components/new_dropdown/index_spec.js | 1 |
4 files changed, 7 insertions, 8 deletions
diff --git a/app/assets/javascripts/ide/components/new_dropdown/index.vue b/app/assets/javascripts/ide/components/new_dropdown/index.vue index 822310e2a76..15d30861913 100644 --- a/app/assets/javascripts/ide/components/new_dropdown/index.vue +++ b/app/assets/javascripts/ide/components/new_dropdown/index.vue @@ -17,10 +17,6 @@ export default { type: String, required: true, }, - branch: { - type: String, - required: true, - }, path: { type: String, required: false, diff --git a/app/assets/javascripts/ide/components/repo_file.vue b/app/assets/javascripts/ide/components/repo_file.vue index 0ca87fb76ed..03e1c917202 100644 --- a/app/assets/javascripts/ide/components/repo_file.vue +++ b/app/assets/javascripts/ide/components/repo_file.vue @@ -213,8 +213,6 @@ export default { <new-dropdown v-if="!disableActionDropdown" :type="file.type" - :project-id="file.projectId" - :branch="file.branchId" :path="file.path" :mouse-over="mouseOver" class="float-right prepend-left-8" diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 09a35b5da07..c79e19c7fc1 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -8,8 +8,6 @@ msgid "" msgstr "" "Project-Id-Version: gitlab 1.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-10 16:02-0700\n" -"PO-Revision-Date: 2018-07-10 16:02-0700\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: \n" @@ -4261,6 +4259,9 @@ msgstr "" msgid "Remove project" msgstr "" +msgid "Rename" +msgstr "" + msgid "Repository" msgstr "" @@ -5420,6 +5421,9 @@ msgstr "" msgid "Up to date" msgstr "" +msgid "Update" +msgstr "" + msgid "Update %{files}" msgid_plural "Update %{files} files" msgstr[0] "" diff --git a/spec/javascripts/ide/components/new_dropdown/index_spec.js b/spec/javascripts/ide/components/new_dropdown/index_spec.js index 4d704b80209..5c3b21f3de5 100644 --- a/spec/javascripts/ide/components/new_dropdown/index_spec.js +++ b/spec/javascripts/ide/components/new_dropdown/index_spec.js @@ -14,6 +14,7 @@ describe('new dropdown component', () => { branch: 'master', path: '', mouseOver: false, + type: 'blob', }); vm.$store.state.currentProjectId = 'abcproject'; |