diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/controllers/groups/imports_controller.rb | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/controllers/groups/imports_controller.rb')
-rw-r--r-- | app/controllers/groups/imports_controller.rb | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/app/controllers/groups/imports_controller.rb b/app/controllers/groups/imports_controller.rb new file mode 100644 index 00000000000..b611685f9bc --- /dev/null +++ b/app/controllers/groups/imports_controller.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +class Groups::ImportsController < Groups::ApplicationController + include ContinueParams + + def show + if @group.import_state.nil? || @group.import_state.finished? + if continue_params[:to] + redirect_to continue_params[:to], notice: continue_params[:notice] + else + redirect_to group_path(@group), notice: s_('GroupImport|The group was successfully imported.') + end + elsif @group.import_state.failed? + redirect_to new_group_path(@group), alert: s_('GroupImport|Failed to import group.') + else + flash.now[:notice] = continue_params[:notice_now] + end + end +end |