diff options
| -rw-r--r-- | app/assets/stylesheets/page_bundles/login.scss | 24 | ||||
| -rw-r--r-- | app/graphql/types/query_type.rb | 3 | ||||
| -rw-r--r-- | app/views/devise/shared/_tabs_ldap.html.haml | 2 | ||||
| -rw-r--r-- | config/feature_flags/development/gitlab_duo_chat_requests_to_ai_gateway.yml | 2 | ||||
| -rw-r--r-- | doc/api/graphql/reference/index.md | 2 |
5 files changed, 5 insertions, 28 deletions
diff --git a/app/assets/stylesheets/page_bundles/login.scss b/app/assets/stylesheets/page_bundles/login.scss index bdbb2fb786f..11582ff72f0 100644 --- a/app/assets/stylesheets/page_bundles/login.scss +++ b/app/assets/stylesheets/page_bundles/login.scss @@ -47,30 +47,6 @@ border-top-right-radius: $border-radius-default; border-top-left-radius: $border-radius-default; - // Ldap configurations may need more tabs & the tab labels are user generated (arbitrarily long). - // These styles prevent this from breaking the layout, and only applied when providers are configured. - &.custom-provider-tabs { - flex-wrap: wrap; - - li { - min-width: 85px; - flex-basis: auto; - - // This styles tab elements that have wrapped to a second line. We cannot easily predict when this will happen. - // We are making somewhat of an assumption about the configuration here: that users do not have more than - // 3 LDAP servers configured (in addition to standard login) and they are not using especially long names for any - // of them. If either condition is false, this will work as expected. If both are true, there may be a missing border - // above one of the bottom row elements. If you know a better way, please implement it! - &:nth-child(n+5) { - border-top: 1px solid $border-color; - } - } - - a { - font-size: 16px; - } - } - li { flex: 1; text-align: center; diff --git a/app/graphql/types/query_type.rb b/app/graphql/types/query_type.rb index 2042eee0116..47a049fe10c 100644 --- a/app/graphql/types/query_type.rb +++ b/app/graphql/types/query_type.rb @@ -86,7 +86,8 @@ module Types field :jobs, ::Types::Ci::JobType.connection_type, null: true, - description: 'All jobs on this GitLab instance.', + description: 'All jobs on this GitLab instance.' \ + ' Returns an empty result for users without administrator access.', resolver: ::Resolvers::Ci::AllJobsResolver field :merge_request, Types::MergeRequestType, null: true, diff --git a/app/views/devise/shared/_tabs_ldap.html.haml b/app/views/devise/shared/_tabs_ldap.html.haml index 0d7929b6acb..3e9d60da228 100644 --- a/app/views/devise/shared/_tabs_ldap.html.haml +++ b/app/views/devise/shared/_tabs_ldap.html.haml @@ -1,7 +1,7 @@ - show_password_form = local_assigns.fetch(:show_password_form, password_authentication_enabled_for_web?) - render_signup_link = local_assigns.fetch(:render_signup_link, true) -%ul.nav-links.new-session-tabs.nav-tabs.nav.nav-links-unboxed{ class: "#{'custom-provider-tabs' if any_form_based_providers_enabled?}" } +%ul.nav-links.new-session-tabs.nav-tabs.nav.nav-links-unboxed - if crowd_enabled? %li.nav-item = link_to _("Crowd"), "#crowd", class: "nav-link #{active_when(form_based_auth_provider_has_active_class?(:crowd))}", 'data-toggle' => 'tab', role: 'tab' diff --git a/config/feature_flags/development/gitlab_duo_chat_requests_to_ai_gateway.yml b/config/feature_flags/development/gitlab_duo_chat_requests_to_ai_gateway.yml index fc15ee5f1b9..bc90bd298fc 100644 --- a/config/feature_flags/development/gitlab_duo_chat_requests_to_ai_gateway.yml +++ b/config/feature_flags/development/gitlab_duo_chat_requests_to_ai_gateway.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/433213 milestone: '16.7' type: development group: group::ai framework -default_enabled: false +default_enabled: true diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md index aa5d0c3793a..775a53bb83f 100644 --- a/doc/api/graphql/reference/index.md +++ b/doc/api/graphql/reference/index.md @@ -521,7 +521,7 @@ Returns [`Iteration`](#iteration). ### `Query.jobs` -All jobs on this GitLab instance. +All jobs on this GitLab instance. Returns an empty result for users without administrator access. Returns [`CiJobConnection`](#cijobconnection). |