Commit 23c6affe authored by Stan Hu's avatar Stan Hu

Merge branch 'georgekoltsov/update-github-importer-prs' into 'master'

Update GitHub PRs Importer to force update repository

See merge request gitlab-org/gitlab!80379
parents fb97080c 4b20a3de
...@@ -40,7 +40,7 @@ module Gitlab ...@@ -40,7 +40,7 @@ module Gitlab
# updating the timestamp. # updating the timestamp.
project.touch(:last_repository_updated_at) # rubocop: disable Rails/SkipsModelValidations project.touch(:last_repository_updated_at) # rubocop: disable Rails/SkipsModelValidations
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 pname = project.path_with_namespace
......
...@@ -164,7 +164,7 @@ RSpec.describe Gitlab::GithubImport::Importer::PullRequestsImporter do ...@@ -164,7 +164,7 @@ RSpec.describe Gitlab::GithubImport::Importer::PullRequestsImporter do
expect(project.repository) expect(project.repository)
.to receive(:fetch_remote) .to receive(:fetch_remote)
.with(url, forced: false, refmap: Gitlab::GithubImport.refmap) .with(url, forced: true, refmap: Gitlab::GithubImport.refmap)
freeze_time do freeze_time do
importer.update_repository importer.update_repository
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment