This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Update for API change to git ruby (#1032)

* Update for API change to git ruby

* Fix template
  • Loading branch information...
taquitos committed Jun 25, 2018
1 parent 07cd0d3 commit 795707430f93003c6ac5ba8b4b76139acb63f8ce
Showing with 1 addition and 3 deletions.
  1. +0 −2 PULL_REQUEST_TEMPLATE.md
  2. +1 −1 app/shared/models/git_repo.rb
View
@@ -1,7 +1,5 @@
```
- [ ] I have run `rspec` and corrected all errors
- [ ] I have run `rubocop` and corrected all errors
- [ ] I have run `npm run test` and corrected all errors
- [ ] I have tested this change locally and tried to launch the server as well as access a project, and with that at least one build
- [ ] If there is an existing issue, make sure to add `Fixes ...` as part of the PR body to reference the issue you're solving
```
@@ -666,7 +666,7 @@ def switch_to_ref(git_fork_config:, local_branch_name:, use_global_git_mutex: fa
begin
ref = "#{git_fork_config.ref}:#{local_branch_name}"
logger.debug("Switching to new branch from ref #{ref} (pulling into #{local_branch_name})")
git.fetch(GitRepo::DEFAULT_REMOTE, ref, {})
git.fetch(GitRepo::DEFAULT_REMOTE, { ref: ref })
git.branch(local_branch_name)
git.checkout(local_branch_name)
return true

0 comments on commit 7957074

Please sign in to comment.