diff options
| author | Marcia Ramos <virtua.creative@gmail.com> | 2018-03-09 12:36:26 -0300 |
|---|---|---|
| committer | Marcia Ramos <virtua.creative@gmail.com> | 2018-03-09 12:36:26 -0300 |
| commit | 5596933b535d632cf3c8159889a72b1e98e4ec0a (patch) | |
| tree | 5edc39c0408a1e5bcbc13168dedbdabd1eba417f /app/controllers/projects/settings | |
| parent | da5694c5cbaf62d5568339efd1a6f340f97e6e53 (diff) | |
| parent | 3bbe60f8e802ce3d9da060a47b7f635dedba7370 (diff) | |
| download | gitlab-ce-docs-refactor-dev-guides.tar.gz | |
fix conflictdocs-refactor-dev-guides
Diffstat (limited to 'app/controllers/projects/settings')
| -rw-r--r-- | app/controllers/projects/settings/ci_cd_controller.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/app/controllers/projects/settings/ci_cd_controller.rb b/app/controllers/projects/settings/ci_cd_controller.rb index 86717bb7242..259809f3429 100644 --- a/app/controllers/projects/settings/ci_cd_controller.rb +++ b/app/controllers/projects/settings/ci_cd_controller.rb @@ -13,12 +13,14 @@ module Projects def reset_cache if ResetProjectCacheService.new(@project, current_user).execute - flash[:notice] = _("Project cache successfully reset.") + respond_to do |format| + format.json { head :ok } + end else - flash[:error] = _("Unable to reset project cache.") + respond_to do |format| + format.json { head :bad_request } + end end - - redirect_to project_pipelines_path(@project) end private |