From 1308dc5eb484ab0f8064989fc551ebdb4b1a7976 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 13 Feb 2020 12:08:49 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../javascripts/code_navigation/store/actions.js | 3 - app/assets/javascripts/diffs/components/app.vue | 2 +- app/assets/javascripts/flash.js | 2 +- .../ide/components/commit_sidebar/form.vue | 12 +- .../javascripts/ide/components/file_row_extra.vue | 15 +- app/assets/javascripts/ide/stores/actions.js | 9 +- app/assets/javascripts/ide/stores/actions/file.js | 4 +- .../explorer/components/group_empty_state.vue | 39 +++ .../explorer/components/project_empty_state.vue | 113 +++++++ .../registry/explorer/pages/details.vue | 329 ++++++++++++++++++++- .../javascripts/registry/explorer/pages/list.vue | 211 ++++++++++++- .../registry/explorer/stores/actions.js | 4 +- .../registry/explorer/stores/mutations.js | 1 + 13 files changed, 703 insertions(+), 41 deletions(-) create mode 100644 app/assets/javascripts/registry/explorer/components/group_empty_state.vue create mode 100644 app/assets/javascripts/registry/explorer/components/project_empty_state.vue (limited to 'app/assets') diff --git a/app/assets/javascripts/code_navigation/store/actions.js b/app/assets/javascripts/code_navigation/store/actions.js index cb6d30c775d..2c52074e362 100644 --- a/app/assets/javascripts/code_navigation/store/actions.js +++ b/app/assets/javascripts/code_navigation/store/actions.js @@ -1,6 +1,4 @@ import api from '~/api'; -import { __ } from '~/locale'; -import createFlash from '~/flash'; import * as types from './mutation_types'; import { getCurrentHoverElement, setCurrentHoverElement, addInteractionClass } from '../utils'; @@ -10,7 +8,6 @@ export default { }, requestDataError({ commit }) { commit(types.REQUEST_DATA_ERROR); - createFlash(__('An error occurred loading code navigation')); }, fetchData({ commit, dispatch, state }) { commit(types.REQUEST_DATA); diff --git a/app/assets/javascripts/diffs/components/app.vue b/app/assets/javascripts/diffs/components/app.vue index 878b54f7d53..f9d3d31e152 100644 --- a/app/assets/javascripts/diffs/components/app.vue +++ b/app/assets/javascripts/diffs/components/app.vue @@ -354,7 +354,7 @@ export default {