diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index d5ee503c44c6ec59600489add400c99ae5e14f0f..56e064971c1b37b75a903caf80dae487409b28a9 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 8a6af8d8adafd88d69cc4ec8b5f5ef8dc83088ad..6b7dc0b3960dadd7bc83735e1d2bf8def484f41e 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 0000000000000000000000000000000000000000..0215b2740f1c31e426bca43cbf09dfbcf985764b --- /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 5ddcaa60dc6a39f11ee15c4af557c01fbc11f4e1..d0a63aa9403a5e0220d65daa5ff45cccf5792e54 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