Fix pre-main-jh pipeline 2197322 due to upstream changes
What does this MR do and why?
https://jihulab.com/gitlab-cn/gitlab/-/jobs/11345196
Failed job:rspec ./jh/spec/features/profile_with_phone_verification_spec.rb:25 # Profile account page with phone verification their new avatar is immediately visible in the header and setting sidebar
Changes from Upstream MR: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135721/diffs
Related JH MR: !1853 (merged)
https://jihulab.com/gitlab-cn/gitlab/-/jobs/11345045
Failed job:NotImplementedError: #<Class:Gitlab::Llm::CompletionsFactory>#completion doesn't exist!
Changes from Upstream MR: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/134752
https://jihulab.com/gitlab-cn/gitlab/-/jobs/11345090
Failed job:Changes from Upstream MR: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135793/
@jeremywu Please review changes from the front-end perspective, thanks
Failed examples:
rspec './spec/views/layouts/devise.html.haml_spec.rb[1:1:1:1:1]' # layouts/devise behaves like a layout which reflects the application theme setting as a themed layout when no theme is explicitly selected renders with the default theme
rspec './spec/views/layouts/devise.html.haml_spec.rb[1:1:1:2:1:1]' # layouts/devise behaves like a layout which reflects the application theme setting as a themed layout when user is authenticated & has selected a specific theme chosen_theme: #<struct Gitlab::Themes::Theme id=1, name="Indigo", css_class="ui-indigo", css_filename="theme_indigo", primary_color="#222261"> renders with the Indigo theme
rspec './spec/views/layouts/devise.html.haml_spec.rb[1:1:1:2:2:1]' # layouts/devise behaves like a layout which reflects the application theme setting as a themed layout when user is authenticated & has selected a specific theme chosen_theme: #<struct Gitlab::Themes::Theme id=6, name="Light Indigo", css_class="ui-light-indigo", css_filename="theme_light_indigo", primary_color="#41419f"> renders with the Light Indigo theme
rspec './spec/views/layouts/devise.html.haml_spec.rb[1:1:1:2:3:1]' # layouts/devise behaves like a layout which reflects the application theme setting as a themed layout when user is authenticated & has selected a specific theme chosen_theme: #<struct Gitlab::Themes::Theme id=4, name="Blue", css_class="ui-blue", css_filename="theme_blue", primary_color="#0b2640"> renders with the Blue theme
rspec './spec/views/layouts/devise.html.haml_spec.rb[1:1:1:2:4:1]' # layouts/devise behaves like a layout which reflects the application theme setting as a themed layout when user is authenticated & has selected a specific theme chosen_theme: #<struct Gitlab::Themes::Theme id=7, name="Light Blue", css_class="ui-light-blue", css_filename="theme_light_blue", primary_color="#145aa1"> renders with the Light Blue theme
rspec './spec/views/layouts/devise.html.haml_spec.rb[1:1:1:2:5:1]' # layouts/devise behaves like a layout which reflects the application theme setting as a themed layout when user is authenticated & has selected a specific theme chosen_theme: #<struct Gitlab::Themes::Theme id=5, name="Green", css_class="ui-green", css_filename="theme_green", primary_color="#0e4328"> renders with the Green theme
rspec './spec/views/layouts/devise.html.haml_spec.rb[1:1:1:2:6:1]' # layouts/devise behaves like a layout which reflects the application theme setting as a themed layout when user is authenticated & has selected a specific theme chosen_theme: #<struct Gitlab::Themes::Theme id=8, name="Light Green", css_class="ui-light-green", css_filename="theme_light_green", primary_color="#1b653f"> renders with the Light Green theme
rspec './spec/views/layouts/devise.html.haml_spec.rb[1:1:1:2:7:1]' # layouts/devise behaves like a layout which reflects the application theme setting as a themed layout when user is authenticated & has selected a specific theme chosen_theme: #<struct Gitlab::Themes::Theme id=9, name="Red", css_class="ui-red", css_filename="theme_red", primary_color="#580d02"> renders with the Red theme
rspec './spec/views/layouts/devise.html.haml_spec.rb[1:1:1:2:8:1]' # layouts/devise behaves like a layout which reflects the application theme setting as a themed layout when user is authenticated & has selected a specific theme chosen_theme: #<struct Gitlab::Themes::Theme id=10, name="Light Red", css_class="ui-light-red", css_filename="theme_light_red", primary_color="#a02e1c"> renders with the Light Red theme
rspec './spec/views/layouts/devise.html.haml_spec.rb[1:1:1:2:9:1]' # layouts/devise behaves like a layout which reflects the application theme setting as a themed layout when user is authenticated & has selected a specific theme chosen_theme: #<struct Gitlab::Themes::Theme id=2, name="Gray", css_class="ui-gray", css_filename="theme_gray", primary_color="#333238"> renders with the Gray theme
rspec './spec/views/layouts/devise.html.haml_spec.rb[1:1:1:2:10:1]' # layouts/devise behaves like a layout which reflects the application theme setting as a themed layout when user is authenticated & has selected a specific theme chosen_theme: #<struct Gitlab::Themes::Theme id=3, name="Light Gray", css_class="ui-light-gray", css_filename="theme_light_gray", primary_color="#ececef"> renders with the Light Gray theme
rspec './spec/views/layouts/devise.html.haml_spec.rb[1:1:1:2:11:1]' # layouts/devise behaves like a layout which reflects the application theme setting as a themed layout when user is authenticated & has selected a specific theme chosen_theme: #<struct Gitlab::Themes::Theme id=11, name="Dark Mode (alpha)", css_class="gl-dark", css_filename=nil, primary_color="#1f1e24"> renders with the Dark Mode (alpha) theme
[TEST PROF INFO] Time spent in factories: 00:00.022 (0.04% of total time)
https://jihulab.com/gitlab-cn/gitlab/-/jobs/11345099
Failed job:rspec ./spec/workers/every_sidekiq_worker_spec.rb:507 # Every Sidekiq worker retries uses the default number of retries for new jobs
Fixed in JH MR: !2135 (merged)
Screenshots or screen recordings
Non-UI
How to set up and validate locally
Numbered steps to set up and validate the change are strongly suggested.
MR acceptance checklist
This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.
-
I have evaluated the MR acceptance checklist for this MR.
由 Baodong 编辑于