diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-15 11:58:20 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-15 11:58:20 +0300 |
| commit | 59c9ff627603da03f6a7c330d57a2c765b3c24a3 (patch) | |
| tree | dd8f3a2fbc9564818a77d2d8798fcc464d220e8e /lib | |
| parent | 30b4659f2c485885324fd8d67fcd92a2939310a3 (diff) | |
Add latest changes from gitlab-org/gitlab@14-7-stable-ee
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/helpers/packages/conan/api_helpers.rb | 1 | ||||
| -rw-r--r-- | lib/gitlab/github_import/importer/pull_requests_importer.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/import_export/project/object_builder.rb | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/lib/api/helpers/packages/conan/api_helpers.rb b/lib/api/helpers/packages/conan/api_helpers.rb index 031c29e7472..e92547890e8 100644 --- a/lib/api/helpers/packages/conan/api_helpers.rb +++ b/lib/api/helpers/packages/conan/api_helpers.rb @@ -145,6 +145,7 @@ module API .with_conan_username(params[:package_username]) .with_conan_channel(params[:package_channel]) .order_created + .not_pending_destruction .last end end diff --git a/lib/gitlab/github_import/importer/pull_requests_importer.rb b/lib/gitlab/github_import/importer/pull_requests_importer.rb index 2812fbd3dfe..d7eaa5a470b 100644 --- a/lib/gitlab/github_import/importer/pull_requests_importer.rb +++ b/lib/gitlab/github_import/importer/pull_requests_importer.rb @@ -40,7 +40,7 @@ module Gitlab # updating the timestamp. project.update_column(:last_repository_updated_at, Time.zone.now) - project.repository.fetch_remote(project.import_url, refmap: Gitlab::GithubImport.refmap, forced: false) + project.repository.fetch_remote(project.import_url, refmap: Gitlab::GithubImport.refmap, forced: true) pname = project.path_with_namespace diff --git a/lib/gitlab/import_export/project/object_builder.rb b/lib/gitlab/import_export/project/object_builder.rb index f7598ba1337..64496d23402 100644 --- a/lib/gitlab/import_export/project/object_builder.rb +++ b/lib/gitlab/import_export/project/object_builder.rb @@ -61,7 +61,7 @@ module Gitlab def where_clause_for_klass return attrs_to_arel(attributes.slice('filename')).and(table[:issue_id].eq(nil)) if design? - attrs_to_arel(attributes.slice('iid')) if merge_request? + attrs_to_arel(attributes.slice('iid', 'target_project_id')) if merge_request? end def prepare_attributes |