diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-08 06:08:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-08 06:08:42 +0300 |
| commit | 5500dd34b9b489ee5c6609c8988bfe039f37e3e9 (patch) | |
| tree | bbb0df8272862f0622cc6886fa76fd2f44107ea1 /app | |
| parent | 53e998950e2dfeed22bec2eff74c5c996fe76856 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/listbox_input/listbox_input.vue | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/utilities.scss | 4 | ||||
| -rw-r--r-- | app/models/project.rb | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/app/assets/javascripts/vue_shared/components/listbox_input/listbox_input.vue b/app/assets/javascripts/vue_shared/components/listbox_input/listbox_input.vue index a59a7494472..09ecad0713a 100644 --- a/app/assets/javascripts/vue_shared/components/listbox_input/listbox_input.vue +++ b/app/assets/javascripts/vue_shared/components/listbox_input/listbox_input.vue @@ -117,7 +117,7 @@ export default { }, toggleText() { return this.selected - ? this.allOptions.find((option) => option.value === this.selected).text + ? this.allOptions.find((option) => option.value === this.selected)?.text : this.defaultToggleText; }, }, diff --git a/app/assets/stylesheets/utilities.scss b/app/assets/stylesheets/utilities.scss index 1d2a3036cc5..d5e9d35983a 100644 --- a/app/assets/stylesheets/utilities.scss +++ b/app/assets/stylesheets/utilities.scss @@ -65,10 +65,6 @@ min-width: 0; } -.gl-min-h-100vh { - min-height: 100vh; -} - // .gl-font-size-inherit will be moved to @gitlab/ui by https://gitlab.com/gitlab-org/gitlab-ui/-/issues/1466 .gl-font-size-inherit, .font-size-inherit { font-size: inherit; } diff --git a/app/models/project.rb b/app/models/project.rb index 5ed6039b9df..dddaed53077 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1761,7 +1761,8 @@ class Project < ApplicationRecord # rubocop: disable CodeReuse/ServiceClass def create_labels Label.templates.each do |label| - params = label.attributes.except('id', 'template', 'created_at', 'updated_at', 'type') + # slice on column_names to ensure an added DB column will not break a mixed deployment + params = label.attributes.slice(*Label.column_names).except('id', 'template', 'created_at', 'updated_at', 'type') Labels::FindOrCreateService.new(nil, self, params).execute(skip_authorization: true) end end |