diff options
| author | sandish chen <sandish.chen@huawei.com> | 2016-10-21 02:19:33 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-01-15 01:31:25 -0500 |
| commit | 81f7a7ab62edf33234e7eb10834828ecd1793cb4 (patch) | |
| tree | fdae74157827ef3b4572fcba0efbb018de0368d8 | |
| parent | 28f633a96a4b16f680dc345aa87fa7aa21c53481 (diff) | |
| download | gitlab-ce-81f7a7ab62edf33234e7eb10834828ecd1793cb4.tar.gz | |
Fix to display notice when project settings updated.
Change validity checking for UpdateService.
Add return value for project update service.
Return 302(redirect_to) when successfully updated.
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | app/controllers/projects_controller.rb | 4 | ||||
| -rw-r--r-- | app/services/projects/update_service.rb | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/sandish-gitlab-ce-update_ret_val.yml | 4 | ||||
| -rw-r--r-- | spec/controllers/projects_controller_spec.rb | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index d5ee503c44c..56e064971c1 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -42,13 +42,13 @@ class ProjectsController < Projects::ApplicationController end def update - status = ::Projects::UpdateService.new(@project, current_user, project_params).execute + project = ::Projects::UpdateService.new(@project, current_user, project_params).execute # Refresh the repo in case anything changed @repository = project.repository respond_to do |format| - if status + if project.valid? flash[:notice] = "Project '#{@project.name}' was successfully updated." format.html do redirect_to( diff --git a/app/services/projects/update_service.rb b/app/services/projects/update_service.rb index 8a6af8d8ada..6b7dc0b3960 100644 --- a/app/services/projects/update_service.rb +++ b/app/services/projects/update_service.rb @@ -24,6 +24,7 @@ module Projects project.rename_repo end end + project end end end diff --git a/changelogs/unreleased/sandish-gitlab-ce-update_ret_val.yml b/changelogs/unreleased/sandish-gitlab-ce-update_ret_val.yml new file mode 100644 index 00000000000..0215b2740f1 --- /dev/null +++ b/changelogs/unreleased/sandish-gitlab-ce-update_ret_val.yml @@ -0,0 +1,4 @@ +--- +title: Fix none display notice when project settings updated +merge_request: +author: Sandish Chen diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb index 5ddcaa60dc6..d0a63aa9403 100644 --- a/spec/controllers/projects_controller_spec.rb +++ b/spec/controllers/projects_controller_spec.rb @@ -245,7 +245,7 @@ describe ProjectsController do expect(project.repository.path).to include(new_path) expect(assigns(:repository).path).to eq(project.repository.path) - expect(response).to have_http_status(200) + expect(response).to have_http_status(302) end end |