diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/work_items/components/work_item_milestone.vue | 8 | ||||
| -rw-r--r-- | app/controllers/concerns/import/github_oauth.rb | 1 | ||||
| -rw-r--r-- | app/models/postgresql/detached_partition.rb | 4 |
3 files changed, 11 insertions, 2 deletions
diff --git a/app/assets/javascripts/work_items/components/work_item_milestone.vue b/app/assets/javascripts/work_items/components/work_item_milestone.vue index a8d3b57aae0..6a6d8d210e8 100644 --- a/app/assets/javascripts/work_items/components/work_item_milestone.vue +++ b/app/assets/javascripts/work_items/components/work_item_milestone.vue @@ -118,6 +118,7 @@ export default { return { 'gl-text-gray-500!': this.canUpdate && this.isNoMilestone, 'is-not-focused': !this.isFocused, + 'gl-min-w-20': true, }; }, }, @@ -214,9 +215,10 @@ export default { <template> <gl-form-group - class="work-item-dropdown" + class="work-item-dropdown gl-flex-nowrap" :label="$options.i18n.MILESTONE" - label-class="gl-pb-0! gl-overflow-wrap-break gl-mt-3" + label-for="milestone-value" + label-class="gl-pb-0! gl-mt-3 gl-overflow-wrap-break" label-cols="3" label-cols-lg="2" > @@ -229,6 +231,8 @@ export default { </span> <gl-dropdown v-else + id="milestone-value" + class="col-9 gl-pl-0" :toggle-class="dropdownClasses" :text="dropdownText" :loading="updateInProgress" diff --git a/app/controllers/concerns/import/github_oauth.rb b/app/controllers/concerns/import/github_oauth.rb index d53022aabf2..c233f5d09fa 100644 --- a/app/controllers/concerns/import/github_oauth.rb +++ b/app/controllers/concerns/import/github_oauth.rb @@ -53,6 +53,7 @@ module Import def authorize_url state = SecureRandom.base64(64) session[auth_state_key] = state + session[:auth_on_failure_path] = "#{new_project_path}#import_project" if Feature.enabled?(:remove_legacy_github_client) oauth_client.auth_code.authorize_url( redirect_uri: callback_import_url, diff --git a/app/models/postgresql/detached_partition.rb b/app/models/postgresql/detached_partition.rb index b0dd52c9657..d26778957d5 100644 --- a/app/models/postgresql/detached_partition.rb +++ b/app/models/postgresql/detached_partition.rb @@ -7,5 +7,9 @@ module Postgresql def fully_qualified_table_name "#{Gitlab::Database::DYNAMIC_PARTITIONS_SCHEMA}.#{table_name}" end + + def table_schema + Gitlab::Database::GitlabSchema.table_schema(table_name) + end end end |