diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-21 15:36:58 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-21 15:36:58 +0300 |
| commit | 2505300b7b2506305a7e1af1ad2837ed72773ac6 (patch) | |
| tree | 88187926351c083c9fa2e616d9ec5974195c800d /app/controllers | |
| parent | d128bc9241a1024a9e1d632555ec1e5306c89623 (diff) | |
| parent | 86dfdc36bd5f63f5ac4197c0e1e0e422555818fd (diff) | |
| download | gitlab-ce-2505300b7b2506305a7e1af1ad2837ed72773ac6.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/controllers/import/google_code_controller.rb
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/import/google_code_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/import/google_code_controller.rb b/app/controllers/import/google_code_controller.rb index 8a9ff652263..5adf6ed7853 100644 --- a/app/controllers/import/google_code_controller.rb +++ b/app/controllers/import/google_code_controller.rb @@ -68,7 +68,7 @@ class Import::GoogleCodeController < Import::BaseController def status unless client.valid? - return redirect_to new_import_google_path + return redirect_to new_import_google_code_path end @repos = client.repos |