From f14507e586a7f75f0fb71a1d8468b7361be860d4 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 3 Feb 2020 09:08:42 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../javascripts/diff_notes/models/discussion.js | 6 +- .../javascripts/diff_notes/stores/comments.js | 6 +- .../environments/components/container.vue | 2 +- .../environments/components/environments_table.vue | 2 +- .../javascripts/error_tracking_settings/utils.js | 2 +- app/assets/javascripts/helpers/diffs_helper.js | 10 +- .../javascripts/ide/stores/actions/project.js | 4 +- app/assets/javascripts/lib/utils/webpack.js | 2 +- .../merge_conflicts/merge_conflict_store.js | 2 +- app/assets/javascripts/network/branch_graph.js | 10 +- app/assets/javascripts/notes.js | 2 +- .../settings/components/registry_settings_app.vue | 2 +- .../registry/settings/components/settings_form.vue | 207 +---------------- .../javascripts/registry/settings/constants.js | 15 -- .../javascripts/registry/settings/store/getters.js | 13 +- .../registry/settings/store/mutations.js | 4 +- app/assets/javascripts/registry/settings/utils.js | 6 - .../shared/components/expiration_policy_form.vue | 247 +++++++++++++++++++++ .../javascripts/registry/shared/constants.js | 15 ++ app/assets/javascripts/registry/shared/utils.js | 19 ++ app/assets/javascripts/users_select.js | 2 +- .../vue_shared/components/modal_copy_button.vue | 2 +- app/assets/javascripts/webpack.js | 2 +- app/assets/javascripts/zen_mode.js | 6 +- 24 files changed, 336 insertions(+), 252 deletions(-) delete mode 100644 app/assets/javascripts/registry/settings/constants.js delete mode 100644 app/assets/javascripts/registry/settings/utils.js create mode 100644 app/assets/javascripts/registry/shared/components/expiration_policy_form.vue create mode 100644 app/assets/javascripts/registry/shared/constants.js create mode 100644 app/assets/javascripts/registry/shared/utils.js (limited to 'app/assets') diff --git a/app/assets/javascripts/diff_notes/models/discussion.js b/app/assets/javascripts/diff_notes/models/discussion.js index daf61e5d467..97296a40d6e 100644 --- a/app/assets/javascripts/diff_notes/models/discussion.js +++ b/app/assets/javascripts/diff_notes/models/discussion.js @@ -1,4 +1,4 @@ -/* eslint-disable camelcase, guard-for-in, no-restricted-syntax */ +/* eslint-disable guard-for-in, no-restricted-syntax */ /* global NoteModel */ import $ from 'jquery'; @@ -40,13 +40,13 @@ class DiscussionModel { return true; } - resolveAllNotes(resolved_by) { + resolveAllNotes(resolvedBy) { for (const noteId in this.notes) { const note = this.notes[noteId]; if (!note.resolved) { note.resolved = true; - note.resolved_by = resolved_by; + note.resolved_by = resolvedBy; } } } diff --git a/app/assets/javascripts/diff_notes/stores/comments.js b/app/assets/javascripts/diff_notes/stores/comments.js index 69a972f644d..9bde18c4edf 100644 --- a/app/assets/javascripts/diff_notes/stores/comments.js +++ b/app/assets/javascripts/diff_notes/stores/comments.js @@ -1,4 +1,4 @@ -/* eslint-disable camelcase, no-restricted-syntax, guard-for-in */ +/* eslint-disable no-restricted-syntax, guard-for-in */ /* global DiscussionModel */ import Vue from 'vue'; @@ -26,11 +26,11 @@ window.CommentsStore = { discussion.createNote(noteObj); }, - update(discussionId, noteId, resolved, resolved_by) { + update(discussionId, noteId, resolved, resolvedBy) { const discussion = this.state[discussionId]; const note = discussion.getNote(noteId); note.resolved = resolved; - note.resolved_by = resolved_by; + note.resolved_by = resolvedBy; }, delete(discussionId, noteId) { const discussion = this.state[discussionId]; diff --git a/app/assets/javascripts/environments/components/container.vue b/app/assets/javascripts/environments/components/container.vue index cdf62259479..0a978ab5869 100644 --- a/app/assets/javascripts/environments/components/container.vue +++ b/app/assets/javascripts/environments/components/container.vue @@ -41,7 +41,7 @@ export default {
diff --git a/app/assets/javascripts/environments/components/environments_table.vue b/app/assets/javascripts/environments/components/environments_table.vue index 30299ccc7bc..8abc927c500 100644 --- a/app/assets/javascripts/environments/components/environments_table.vue +++ b/app/assets/javascripts/environments/components/environments_table.vue @@ -170,7 +170,7 @@ export default {