diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/graphql_shared/possible_types.json | 16 | ||||
| -rw-r--r-- | app/assets/javascripts/merge_requests/components/sticky_header.vue | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/diffs.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/page_bundles/merge_requests.scss | 8 | ||||
| -rw-r--r-- | app/graphql/mutations/base_mutation.rb | 6 | ||||
| -rw-r--r-- | app/graphql/resolvers/user_resolver.rb | 2 | ||||
| -rw-r--r-- | app/models/pages_domain.rb | 4 | ||||
| -rw-r--r-- | app/presenters/pages_domain_presenter.rb | 7 | ||||
| -rw-r--r-- | app/views/projects/pages_domains/_dns.html.haml | 3 |
10 files changed, 42 insertions, 11 deletions
diff --git a/app/assets/javascripts/graphql_shared/possible_types.json b/app/assets/javascripts/graphql_shared/possible_types.json index c6c145f5e2b..f35886716ee 100644 --- a/app/assets/javascripts/graphql_shared/possible_types.json +++ b/app/assets/javascripts/graphql_shared/possible_types.json @@ -89,6 +89,22 @@ "NugetMetadata", "PypiMetadata" ], + "Registrable": [ + "CiSecureFileRegistry", + "ContainerRepositoryRegistry", + "DependencyProxyBlobRegistry", + "DependencyProxyManifestRegistry", + "JobArtifactRegistry", + "LfsObjectRegistry", + "MergeRequestDiffRegistry", + "PackageFileRegistry", + "PagesDeploymentRegistry", + "PipelineArtifactRegistry", + "ProjectWikiRepositoryRegistry", + "SnippetRepositoryRegistry", + "TerraformStateVersionRegistry", + "UploadRegistry" + ], "ResolvableInterface": [ "Discussion", "Note" diff --git a/app/assets/javascripts/merge_requests/components/sticky_header.vue b/app/assets/javascripts/merge_requests/components/sticky_header.vue index b49ceb89e3b..e63b9613257 100644 --- a/app/assets/javascripts/merge_requests/components/sticky_header.vue +++ b/app/assets/javascripts/merge_requests/components/sticky_header.vue @@ -106,11 +106,11 @@ export default { @disappear="setStickyHeaderVisible(true)" > <div - class="issue-sticky-header merge-request-sticky-header gl-fixed gl-bg-white gl-pt-3 gl-display-none gl-md-display-block" + class="issue-sticky-header merge-request-sticky-header gl-fixed gl-bg-white gl-display-none gl-md-display-flex gl-flex-direction-column gl-justify-content-end gl-border-b" :class="{ 'gl-visibility-hidden': !isStickyHeaderVisible }" > <div - class="issue-sticky-header-text gl-display-flex gl-flex-direction-column gl-align-items-center gl-mx-auto gl-px-5" + class="issue-sticky-header-text gl-display-flex gl-flex-direction-column gl-align-items-center gl-mx-auto gl-px-5 gl-w-full" :class="{ 'gl-max-w-container-xl': !isFluidLayout }" > <div class="gl-w-full gl-display-flex gl-align-items-center"> diff --git a/app/assets/stylesheets/framework/diffs.scss b/app/assets/stylesheets/framework/diffs.scss index 3885863999b..6c40781670a 100644 --- a/app/assets/stylesheets/framework/diffs.scss +++ b/app/assets/stylesheets/framework/diffs.scss @@ -37,7 +37,7 @@ z-index: 120; &.is-sidebar-moved { - top: calc(#{$calc-application-header-height} + #{$mr-tabs-height} + 24px); + top: calc(#{$calc-application-header-height} + #{$mr-sticky-header-height} - #{$gl-border-size-1}); } &::before { diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 3dd6a435a75..1ba3de68662 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -481,6 +481,7 @@ $highlight-changes-color: rgb(235, 255, 232); $performance-bar-height: 35px; $system-header-height: 16px; $system-footer-height: $system-header-height; +$mr-sticky-header-height: 72px; $mr-review-bar-height: calc(2rem + 13px); $flash-height: 52px; $context-header-height: 60px; diff --git a/app/assets/stylesheets/page_bundles/merge_requests.scss b/app/assets/stylesheets/page_bundles/merge_requests.scss index b282d83b74b..61f8f0de557 100644 --- a/app/assets/stylesheets/page_bundles/merge_requests.scss +++ b/app/assets/stylesheets/page_bundles/merge_requests.scss @@ -266,8 +266,8 @@ $tabs-holder-z-index: 250; } &.is-sidebar-moved { - height: calc(#{$calc-application-viewport-height} - (#{$mr-tabs-height} + #{$diff-file-header-top} + 26px)); - top: calc(#{$calc-application-header-height} + #{$mr-tabs-height} + #{$diff-file-header-top} + 26px); + height: calc(#{$calc-application-viewport-height} - (#{$mr-sticky-header-height} + #{$diff-file-header-top})); + top: calc(#{$calc-application-header-height} + #{$mr-sticky-header-height} + #{$diff-file-header-top}); } } @@ -550,7 +550,7 @@ $tabs-holder-z-index: 250; border-radius: $border-radius-default; } - .mr-widget-section:not(:first-child) { + .mr-widget-section:not(:first-child) > div { border-top: solid 1px var(--border-color, $border-color); } @@ -1078,7 +1078,7 @@ $tabs-holder-z-index: 250; .merge-request-sticky-header { z-index: 204; - box-shadow: 0 1px 4px rgba($gray-300, 0.4); + height: $mr-sticky-header-height; } .merge-request-notification-toggle { diff --git a/app/graphql/mutations/base_mutation.rb b/app/graphql/mutations/base_mutation.rb index 5f98b222099..994668b5f8f 100644 --- a/app/graphql/mutations/base_mutation.rb +++ b/app/graphql/mutations/base_mutation.rb @@ -28,7 +28,7 @@ module Mutations end def ready?(**args) - raise_resource_not_available_error! ERROR_MESSAGE if Gitlab::Database.read_only? + raise_resource_not_available_error!(ERROR_MESSAGE) if read_only? missing_args = self.class.arguments.values .reject { |arg| arg.accepts?(args.fetch(arg.keyword, :not_given)) } @@ -39,6 +39,10 @@ module Mutations true end + def read_only? + Gitlab::Database.read_only? + end + def load_application_object(argument, id, context) ::Gitlab::Graphql::Lazy.new { super } end diff --git a/app/graphql/resolvers/user_resolver.rb b/app/graphql/resolvers/user_resolver.rb index f0fd60e9cbb..ddced5ee859 100644 --- a/app/graphql/resolvers/user_resolver.rb +++ b/app/graphql/resolvers/user_resolver.rb @@ -39,7 +39,7 @@ module Resolvers def batch_load(username) BatchLoader::GraphQL.for(username).batch do |usernames, loader| User.by_username(usernames).each do |user| - loader.call(user.username, user) + loader.call(username, user) end end end diff --git a/app/models/pages_domain.rb b/app/models/pages_domain.rb index 446c4a6187c..10ac10295fc 100644 --- a/app/models/pages_domain.rb +++ b/app/models/pages_domain.rb @@ -172,6 +172,10 @@ class PagesDomain < ApplicationRecord "#{VERIFICATION_KEY}=#{verification_code}" end + def verification_record + "#{verification_domain} TXT #{keyed_verification_code}" + end + def certificate=(certificate) super(certificate) diff --git a/app/presenters/pages_domain_presenter.rb b/app/presenters/pages_domain_presenter.rb index d730608cc27..49322ad6b43 100644 --- a/app/presenters/pages_domain_presenter.rb +++ b/app/presenters/pages_domain_presenter.rb @@ -13,4 +13,11 @@ class PagesDomainPresenter < Gitlab::View::Presenter::Delegated ::Gitlab::LetsEncrypt.enabled? && auto_ssl_failed end + + def user_defined_certificate? + persisted? && + certificate.present? && + certificate_user_provided? && + errors[:certificate].blank? + end end diff --git a/app/views/projects/pages_domains/_dns.html.haml b/app/views/projects/pages_domains/_dns.html.haml index 2c6b808eb1c..3e6a92d8bc0 100644 --- a/app/views/projects/pages_domains/_dns.html.haml +++ b/app/views/projects/pages_domains/_dns.html.haml @@ -13,7 +13,6 @@ %p.form-text.text-muted = _("To access this domain create a new DNS record") - if verification_enabled - - verification_record = "#{domain_presenter.verification_domain} TXT #{domain_presenter.keyed_verification_code}" .form-group.border-section .row .col-sm-2 @@ -24,7 +23,7 @@ = gl_badge_tag text, variant: status = link_to sprite_icon("redo"), verify_project_pages_domain_path(@project, domain_presenter), method: :post, class: "gl-ml-2 gl-button btn btn-sm btn-default has-tooltip", title: _("Retry verification") .input-group - = text_field_tag :domain_verification, verification_record, class: "monospace js-select-on-focus form-control", readonly: true + = text_field_tag :domain_verification, domain_presenter.verification_record, class: "monospace js-select-on-focus form-control", readonly: true .input-group-append = clipboard_button(target: '#domain_verification', class: 'btn-default d-none d-sm-block') %p.form-text.text-muted |