Skip to content

G
gitlab-ce
Commit fb350e6e authored by Filipa Lacerda's avatar Filipa Lacerda
Browse files
Options

Merge branch 'master' into fl-eslint-vue-house-keeping 

* master: (48 commits)
  Avoid checking the user format in every url validation
  Migrate CycleAnalytics::CommitCount to Gitaly
  Hide project name if searching against a project
  Unify app/views/search/results by using EE
  Resolve "Table on Failed Jobs tab is overflowing in IE11 and sm screens"
  Update MrWidgetAuthorTime and MRWidgetMerged spec
  fixed specs
  Fix IDE pipelines eTagPoll not stopping
  Don't use Gitlab::Utils.nlbr in Gitlab::Git
  Move gitaly_blame,  gitaly_count_commits, gitaly_commit_count to opt-out
  Rename MrWidgetAuthorTime vue component
  Use Tooltip component in MrWidgetAuthorTime vue component
  set max_old_space_size to 3.5 GB for compile-assets job
  Remove SCLAU to mirror https://gitlab.com/gitlab-org/gitlab-ee/commit/cd5cef8f84a2b8c58a741e90afec232243a9f3a9
  Add missing `:comment` attribute
  Prevent ENV from leaking variables in CI output
  Bump grape-path-helpers to 1.0.5
  Add more logging before a project is destroyed
  Bump Google Chrome to V67
  Upgrade gitlab-markup to fix render issue with reStructuredText
  ...
parent 6d25c077
Hide whitespace changes
Inline Side-by-side
Showing with 118 additions and 38 deletions
app/assets/javascripts/boards/components/board.js
View file @ fb350e6e
......@@ -22,10 +22,22 @@ gl.issueBoards.Board = Vue.extend({
boardPromotionState,
},
props: {
list: Object,
disabled: Boolean,
issueLinkBase: String,
rootPath: String,
list: {
type: Object,
default: () => ({}),
},
disabled: {
type: Boolean,
required: true,
},
issueLinkBase: {
type: String,
required: true,
},
rootPath: {
type: String,
required: true,
},
boardId: {
type: String,
required: true,
......
app/assets/javascripts/boards/components/board_delete.js
View file @ fb350e6e
......@@ -8,7 +8,10 @@ window.gl.issueBoards = window.gl.issueBoards || {};
gl.issueBoards.BoardDelete = Vue.extend({
props: {
list: Object
list: {
type: Object,
default: () => ({}),
},
},
methods: {
deleteBoard () {
......
app/assets/javascripts/boards/components/board_sidebar.js
View file @ fb350e6e
......@@ -30,7 +30,10 @@ gl.issueBoards.BoardSidebar = Vue.extend({
weight,
},
props: {
currentUser: Object
currentUser: {
type: Object,
default: () => ({}),
},
},
data() {
return {
......
app/assets/javascripts/boards/components/issue_card_inner.js
View file @ fb350e6e
......@@ -40,6 +40,7 @@ gl.issueBoards.IssueCardInner = Vue.extend({
groupId: {
type: Number,
required: false,
default: null,
},
},
data() {
......
app/assets/javascripts/diff_notes/components/comment_resolve_btn.js
View file @ fb350e6e
......@@ -6,7 +6,10 @@ import Vue from 'vue';
const CommentAndResolveBtn = Vue.extend({
props: {
discussionId: String,
discussionId: {
type: String,
required: true,
},
},
data() {
return {
......
app/assets/javascripts/diff_notes/components/diff_note_avatars.js
View file @ fb350e6e
......@@ -10,7 +10,12 @@ const DiffNoteAvatars = Vue.extend({
components: {
userAvatarImage,
},
props: ['discussionId'],
props: {
discussionId: {
type: String,
required: true,
},
},
data() {
return {
isVisible: false,
......
app/assets/javascripts/diff_notes/components/jump_to_discussion.js
View file @ fb350e6e
......@@ -10,7 +10,10 @@ import '../mixins/discussion';
const JumpToDiscussion = Vue.extend({
mixins: [DiscussionMixins],
props: {
discussionId: String
discussionId: {
type: String,
required: true,
},
},
data: function () {
return {
......
app/assets/javascripts/diff_notes/components/resolve_btn.js
View file @ fb350e6e
......@@ -8,14 +8,38 @@ import Flash from '../../flash';
const ResolveBtn = Vue.extend({
props: {
noteId: Number,
discussionId: String,
resolved: Boolean,
canResolve: Boolean,
resolvedBy: String,
authorName: String,
authorAvatar: String,
noteTruncated: String,
noteId: {
type: Number,
required: true,
},
discussionId: {
type: String,
required: true,
},
resolved: {
type: Boolean,
required: true,
},
canResolve: {
type: Boolean,
required: true,
},
resolvedBy: {
type: String,
required: true,
},
authorName: {
type: String,
required: true,
},
authorAvatar: {
type: String,
required: true,
},
noteTruncated: {
type: String,
required: true,
},
},
data: function () {
return {
......
app/assets/javascripts/diff_notes/components/resolve_count.js
View file @ fb350e6e
......@@ -9,7 +9,10 @@ import '../mixins/discussion';
window.ResolveCount = Vue.extend({
mixins: [DiscussionMixins],
props: {
loggedOut: Boolean
loggedOut: {
type: Boolean,
required: true,
},
},
data: function () {
return {
......
app/assets/javascripts/diff_notes/components/resolve_discussion_btn.js
View file @ fb350e6e
......@@ -6,9 +6,18 @@ import Vue from 'vue';
const ResolveDiscussionBtn = Vue.extend({
props: {
discussionId: String,
mergeRequestId: Number,
canResolve: Boolean,
discussionId: {
type: String,
required: true,
},
mergeRequestId: {
type: Number,
required: true,
},
canResolve: {
type: Boolean,
required: true,
},
},
data: function() {
return {
......
app/assets/javascripts/merge_conflicts/components/diff_file_editor.js
View file @ fb350e6e
......@@ -11,9 +11,18 @@ import { __ } from '~/locale';
global.mergeConflicts.diffFileEditor = Vue.extend({
props: {
file: Object,
onCancelDiscardConfirmation: Function,
onAcceptDiscardConfirmation: Function
file: {
type: Object,
required: true,
},
onCancelDiscardConfirmation: {
type: Function,
required: true,
},
onAcceptDiscardConfirmation: {
type: Function,
required: true,
},
},
data() {
return {
......
app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js
View file @ fb350e6e
......@@ -8,7 +8,10 @@ import Vue from 'vue';
global.mergeConflicts.inlineConflictLines = Vue.extend({
mixins: [global.mergeConflicts.utils, global.mergeConflicts.actions],
props: {
file: Object
file: {
type: Object,
required: true,
},
},
});
})(window.gl || (window.gl = {}));
app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js
View file @ fb350e6e
......@@ -8,7 +8,10 @@ import Vue from 'vue';
global.mergeConflicts.parallelConflictLines = Vue.extend({
mixins: [global.mergeConflicts.utils, global.mergeConflicts.actions],
props: {
file: Object
file: {
type: Object,
required: true,
},
},
template: `
<table>
......
yarn.lock
View file @ fb350e6e
......@@ -270,10 +270,14 @@ acorn@^3.0.4:
version "3.3.0"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
acorn@^5.0.0, acorn@^5.3.0, acorn@^5.5.0:
acorn@^5.0.0, acorn@^5.3.0:
version "5.5.3"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9"
acorn@^5.5.0:
version "5.6.2"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.6.2.tgz#b1da1d7be2ac1b4a327fb9eab851702c5045b4e7"
addressparser@1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/addressparser/-/addressparser-1.0.1.tgz#47afbe1a2a9262191db6838e4fd1d39b40821746"
......@@ -2986,30 +2990,25 @@ esprima@^4.0.0:
resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
esquery@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa"
version "1.0.1"
resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
dependencies:
estraverse "^4.0.0"
esrecurse@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.1.0.tgz#4713b6536adf7f2ac4f327d559e7756bff648220"
version "4.2.1"
resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
dependencies:
estraverse "~4.1.0"
object-assign "^4.0.1"
estraverse "^4.1.0"
estraverse@^1.9.1:
version "1.9.3"
resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
estraverse@^4.0.0, estraverse@^4.1.1, estraverse@^4.2.0:
estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
estraverse@~4.1.0:
version "4.1.1"
resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.1.1.tgz#f6caca728933a850ef90661d0e17982ba47111a2"
esutils@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7