diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-21 09:09:25 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-21 09:09:25 +0300 |
| commit | 2df3fbbc602861654d8797da654f578fd2b60303 (patch) | |
| tree | e3c3cb0af5181b29f818fb5b57ed6394bfdafb73 /app | |
| parent | 8f26c00a42ba25e01882774d4f75c4e1dae83443 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/services/ci/register_job_service.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/network/show.html.haml | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/services/ci/register_job_service.rb b/app/services/ci/register_job_service.rb index 0bd4bf8cc86..814fbf5e565 100644 --- a/app/services/ci/register_job_service.rb +++ b/app/services/ci/register_job_service.rb @@ -42,7 +42,7 @@ module Ci if !db_all_caught_up && !result.build metrics.increment_queue_operation(:queue_replication_lag) - ::Ci::RegisterJobService::Result.new(nil, false) # rubocop:disable Cop/AvoidReturnFromBlocks + ::Ci::RegisterJobService::Result.new(nil, nil, false) # rubocop:disable Cop/AvoidReturnFromBlocks else result end diff --git a/app/views/projects/network/show.html.haml b/app/views/projects/network/show.html.haml index b6700c9ed1e..2a3171e9fd8 100644 --- a/app/views/projects/network/show.html.haml +++ b/app/views/projects/network/show.html.haml @@ -6,8 +6,7 @@ .controls.gl-bg-gray-50.gl-p-2.gl-font-base.gl-text-gray-400.gl-border-b-1.gl-border-b-solid.gl-border-b-gray-300 = form_tag project_network_path(@project, @id), method: :get, class: 'form-inline network-form' do |f| = text_field_tag :extended_sha1, @options[:extended_sha1], placeholder: _("Git revision"), class: 'search-input form-control gl-form-input input-mx-250 search-sha gl-mr-2' - = button_tag class: 'btn gl-button btn-confirm btn-icon' do - = sprite_icon('search') + = render Pajamas::ButtonComponent.new(type: :submit, variant: :confirm, icon: 'search') .inline.gl-ml-5 .form-check.light = check_box_tag :filter_ref, 1, @options[:filter_ref], class: 'form-check-input' |