diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-10 03:07:25 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-10 03:07:25 +0000 |
commit | 4a6dacc8662ed65c0b83a3715e4eb05a78168db1 (patch) | |
tree | 04aced9d7d60c1213db9d5152158afe02126599f /app/controllers/groups | |
parent | 070ac34d473978dc27ea2878ed1cf17865e24e9a (diff) | |
download | gitlab-ce-4a6dacc8662ed65c0b83a3715e4eb05a78168db1.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/groups')
-rw-r--r-- | app/controllers/groups/imports_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/groups/imports_controller.rb b/app/controllers/groups/imports_controller.rb index a35237a706d..569e26b3de9 100644 --- a/app/controllers/groups/imports_controller.rb +++ b/app/controllers/groups/imports_controller.rb @@ -14,7 +14,8 @@ class Groups::ImportsController < Groups::ApplicationController 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.') + redirect_to new_group_path(@group), + alert: format(s_('GroupImport|Failed to import group: %{error}'), error: @group.import_state.last_error) else flash.now[:notice] = continue_params[:notice_now] end |