diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-02-02 19:33:33 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-02-02 19:33:33 +0000 |
| commit | c846d3610912bed47404b31c5bc2f190ecbdb93b (patch) | |
| tree | dd98634af5c2796a6435afe6c1e2a7254d981c8b /app/controllers/groups_controller.rb | |
| parent | bb06183d3d8725b328d9f6f05bf5c4a74b93fb36 (diff) | |
| parent | b2e5c423d7080644132c70650bc707feb41cd5a9 (diff) | |
| download | gitlab-ce-update-import-export-docs.tar.gz | |
Merge branch 'master' into 'update-import-export-docs'update-import-export-docs
# Conflicts:
# doc/user/project/settings/import_export.md
Diffstat (limited to 'app/controllers/groups_controller.rb')
| -rw-r--r-- | app/controllers/groups_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index f81237db991..264b14713fb 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -84,7 +84,7 @@ class GroupsController < Groups::ApplicationController if Groups::UpdateService.new(@group, current_user, group_params).execute redirect_to edit_group_path(@group), notice: "Group '#{@group.name}' was successfully updated." else - @group.reset_path! + @group.restore_path! render action: "edit" end |