diff options
author | Michael Kozono <mkozono@gmail.com> | 2017-06-15 17:03:54 -0700 |
---|---|---|
committer | Michael Kozono <mkozono@gmail.com> | 2017-06-16 14:14:19 -0700 |
commit | af784cc6e22ca915f20111828ae3252619834419 (patch) | |
tree | c3afca6b57a9326f7a27adf20b65df713ffc13db /lib/api | |
parent | 3a38e5f1ab914bc4eaeecda6e18caaa7ca9ea5a7 (diff) | |
download | gitlab-ce-af784cc6e22ca915f20111828ae3252619834419.tar.gz |
Add “Project moved” error to Git-over-SSH
Diffstat (limited to 'lib/api')
-rw-r--r-- | lib/api/helpers/internal_helpers.rb | 7 | ||||
-rw-r--r-- | lib/api/internal.rb | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lib/api/helpers/internal_helpers.rb b/lib/api/helpers/internal_helpers.rb index d3732d67622..5e9cf5e68b1 100644 --- a/lib/api/helpers/internal_helpers.rb +++ b/lib/api/helpers/internal_helpers.rb @@ -10,6 +10,10 @@ module API set_project unless defined?(@project) @project end + + def redirected_path + @redirected_path + end def ssh_authentication_abilities [ @@ -38,8 +42,9 @@ module API def set_project if params[:gl_repository] @project, @wiki = Gitlab::GlRepository.parse(params[:gl_repository]) + @redirected_path = nil else - @project, @wiki = Gitlab::RepoPath.parse(params[:project]) + @project, @wiki, @redirected_path = Gitlab::RepoPath.parse(params[:project]) end end diff --git a/lib/api/internal.rb b/lib/api/internal.rb index ecd6d672cf7..9ec418edea4 100644 --- a/lib/api/internal.rb +++ b/lib/api/internal.rb @@ -34,7 +34,7 @@ module API access_checker_klass = wiki? ? Gitlab::GitAccessWiki : Gitlab::GitAccess access_checker = access_checker_klass - .new(actor, project, protocol, authentication_abilities: ssh_authentication_abilities) + .new(actor, project, protocol, authentication_abilities: ssh_authentication_abilities, redirected_path: redirected_path) begin access_checker.check(params[:action], params[:changes]) |