diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-27 09:08:57 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-27 09:08:57 +0300 |
commit | eace733dca6e5c87315b42f42eb4d8f05934d6de (patch) | |
tree | ba737686a8c8e5cc12a298db4303c60680e86e00 /app | |
parent | c25c2a635b1944f5811d7a5eb9984ce5999e64f6 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
4 files changed, 86 insertions, 75 deletions
diff --git a/app/assets/javascripts/manual_ordering.js b/app/assets/javascripts/manual_ordering.js index f93dbcd4c47..683fe8b0b14 100644 --- a/app/assets/javascripts/manual_ordering.js +++ b/app/assets/javascripts/manual_ordering.js @@ -29,6 +29,7 @@ const initManualOrdering = (draggableSelector = 'li.issue') => { issueList, getBoardSortableDefaultOptions({ scroll: true, + fallbackTolerance: 1, dataIdAttr: 'data-id', fallbackOnBody: false, group: { diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue index 14f39c50a2d..9b9c380c9af 100644 --- a/app/assets/javascripts/monitoring/components/dashboard.vue +++ b/app/assets/javascripts/monitoring/components/dashboard.vue @@ -69,6 +69,11 @@ export default { required: false, default: true, }, + showHeader: { + type: Boolean, + required: false, + default: true, + }, showPanels: { type: Boolean, required: false, @@ -129,7 +134,8 @@ export default { }, environmentsEndpoint: { type: String, - required: true, + required: false, + default: '', }, currentEnvironmentName: { type: String, @@ -356,86 +362,88 @@ export default { <template> <div class="prometheus-graphs"> - <div class="prometheus-graphs-header gl-p-3 pb-0 border-bottom bg-gray-light"> + <div + v-if="showHeader" + ref="prometheusGraphsHeader" + class="prometheus-graphs-header gl-p-3 pb-0 border-bottom bg-gray-light" + > <div class="row"> - <template v-if="environmentsEndpoint"> - <gl-form-group - :label="__('Dashboard')" - label-size="sm" - label-for="monitor-dashboards-dropdown" - class="col-sm-12 col-md-6 col-lg-2" - > - <dashboards-dropdown - id="monitor-dashboards-dropdown" - class="mb-0 d-flex" - toggle-class="dropdown-menu-toggle" - :default-branch="defaultBranch" - :selected-dashboard="selectedDashboard" - @selectDashboard="selectDashboard($event)" - /> - </gl-form-group> + <gl-form-group + :label="__('Dashboard')" + label-size="sm" + label-for="monitor-dashboards-dropdown" + class="col-sm-12 col-md-6 col-lg-2" + > + <dashboards-dropdown + id="monitor-dashboards-dropdown" + class="mb-0 d-flex" + toggle-class="dropdown-menu-toggle" + :default-branch="defaultBranch" + :selected-dashboard="selectedDashboard" + @selectDashboard="selectDashboard($event)" + /> + </gl-form-group> - <gl-form-group - :label="s__('Metrics|Environment')" - label-size="sm" - label-for="monitor-environments-dropdown" - class="col-sm-6 col-md-6 col-lg-2" + <gl-form-group + :label="s__('Metrics|Environment')" + label-size="sm" + label-for="monitor-environments-dropdown" + class="col-sm-6 col-md-6 col-lg-2" + > + <gl-dropdown + id="monitor-environments-dropdown" + ref="monitorEnvironmentsDropdown" + data-qa-selector="environments_dropdown" + class="mb-0 d-flex" + toggle-class="dropdown-menu-toggle" + menu-class="monitor-environment-dropdown-menu" + :text="currentEnvironmentName" + :disabled="filteredEnvironments.length === 0" > - <gl-dropdown - id="monitor-environments-dropdown" - ref="monitorEnvironmentsDropdown" - data-qa-selector="environments_dropdown" - class="mb-0 d-flex" - toggle-class="dropdown-menu-toggle" - menu-class="monitor-environment-dropdown-menu" - :text="currentEnvironmentName" - :disabled="filteredEnvironments.length === 0" - > - <div class="d-flex flex-column overflow-hidden"> - <gl-search-box-by-type - v-if="shouldRenderSearchableEnvironmentsDropdown" - ref="monitorEnvironmentsDropdownSearch" - class="m-2" - @input="debouncedEnvironmentsSearch" - /> - <div class="flex-fill overflow-auto"> - <gl-dropdown-item - v-for="environment in filteredEnvironments" - :key="environment.id" - :active="environment.name === currentEnvironmentName" - active-class="is-active" - :href="environment.metrics_path" - >{{ environment.name }}</gl-dropdown-item - > - </div> - <div - v-if="shouldRenderSearchableEnvironmentsDropdown" - v-show="filteredEnvironments.length === 0" - ref="monitorEnvironmentsDropdownMsg" - class="text-secondary no-matches-message" + <div class="d-flex flex-column overflow-hidden"> + <gl-search-box-by-type + v-if="shouldRenderSearchableEnvironmentsDropdown" + ref="monitorEnvironmentsDropdownSearch" + class="m-2" + @input="debouncedEnvironmentsSearch" + /> + <div class="flex-fill overflow-auto"> + <gl-dropdown-item + v-for="environment in filteredEnvironments" + :key="environment.id" + :active="environment.name === currentEnvironmentName" + active-class="is-active" + :href="environment.metrics_path" + >{{ environment.name }}</gl-dropdown-item > - {{ s__('No matching results') }} - </div> </div> - </gl-dropdown> - </gl-form-group> + <div + v-if="shouldRenderSearchableEnvironmentsDropdown" + v-show="filteredEnvironments.length === 0" + ref="monitorEnvironmentsDropdownMsg" + class="text-secondary no-matches-message" + > + {{ s__('No matching results') }} + </div> + </div> + </gl-dropdown> + </gl-form-group> - <gl-form-group - :label="s__('Metrics|Show last')" - label-size="sm" - label-for="monitor-time-window-dropdown" - class="col-sm-6 col-md-6 col-lg-4" - > - <date-time-picker - ref="dateTimePicker" - :start="startDate" - :end="endDate" - :time-windows="datePickerTimeWindows" - @apply="onDateTimePickerApply" - @invalid="onDateTimePickerInvalid" - /> - </gl-form-group> - </template> + <gl-form-group + :label="s__('Metrics|Show last')" + label-size="sm" + label-for="monitor-time-window-dropdown" + class="col-sm-6 col-md-6 col-lg-4" + > + <date-time-picker + ref="dateTimePicker" + :start="startDate" + :end="endDate" + :time-windows="datePickerTimeWindows" + @apply="onDateTimePickerApply" + @invalid="onDateTimePickerInvalid" + /> + </gl-form-group> <gl-form-group v-if="hasHeaderButtons" diff --git a/app/views/notify/links/projects/generic_commit_statuses/_generic_commit_status.html.haml b/app/views/notify/links/projects/generic_commit_statuses/_generic_commit_status.html.haml new file mode 100644 index 00000000000..b6563b185b3 --- /dev/null +++ b/app/views/notify/links/projects/generic_commit_statuses/_generic_commit_status.html.haml @@ -0,0 +1 @@ += build.name diff --git a/app/views/notify/links/projects/generic_commit_statuses/_generic_commit_status.text.erb b/app/views/notify/links/projects/generic_commit_statuses/_generic_commit_status.text.erb new file mode 100644 index 00000000000..af8924bad57 --- /dev/null +++ b/app/views/notify/links/projects/generic_commit_statuses/_generic_commit_status.text.erb @@ -0,0 +1 @@ +Job #<%= build.id %> |