Skip to content

Commit

Permalink
Merge branch 'hotfix/0.149.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
sloria committed Jul 24, 2018
2 parents b7a7800 + ca967b6 commit 92cd334
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions addons/gitlab/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,9 @@ def setUp(self):
self.node_settings = self.project.get_addon('gitlab')
self.node_settings.user_settings = self.project.creator.get_addon('gitlab')
# Set the node addon settings to correspond to the values of the mock repo
self.node_settings.user = self.gitlab.repo.return_value.owner.name
self.node_settings.repo = self.gitlab.repo.return_value.name
self.node_settings.repo_id = self.gitlab.repo.return_value.id
self.node_settings.user = 'fred'
self.node_settings.repo = 'mock-repo'
self.node_settings.repo_id = 1748448
self.node_settings.save()

def _get_sha_for_branch(self, branch=None, mock_branches=None):
Expand Down

0 comments on commit 92cd334

Please sign in to comment.