diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-08-11 11:37:01 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-08-11 11:37:01 +0000 |
| commit | af019d2fa73bfb530454cf884348c49789c9ea28 (patch) | |
| tree | 70e52c479bbbc34868f26dd65044e4f2cf20d787 /lib/gitlab/git_access.rb | |
| parent | 624f35beedde6916dfd331718d0f2ecf6c4ca733 (diff) | |
| parent | 2e6085d8af37d77e550331595ca8a1fc8f2af49f (diff) | |
| download | gitlab-ce-af019d2fa73bfb530454cf884348c49789c9ea28.tar.gz | |
Merge branch 'fix-gitaccess-scope' into 'master'
Fixing scope issue in GitAccess.
This MR fixes a scoping issue around the GitAccessStatus.new call - it needs to be scoped to the Gitlab otherwise it can end up being confused with the GitAccessStatus class in gitlab-shell, which has a 3-element constructor.
Although not strictly necessary for community GitLab, it is more correct, and fixes an issue we (Perforce) found due to our engine overrides.
This change should have any affect on community GitLab.
See merge request !5483
Diffstat (limited to 'lib/gitlab/git_access.rb')
| -rw-r--r-- | lib/gitlab/git_access.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/git_access.rb b/lib/gitlab/git_access.rb index 69943e22353..5bc70f530d2 100644 --- a/lib/gitlab/git_access.rb +++ b/lib/gitlab/git_access.rb @@ -134,7 +134,7 @@ module Gitlab end def build_status_object(status, message = '') - GitAccessStatus.new(status, message) + Gitlab::GitAccessStatus.new(status, message) end end end |