diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-06-05 10:27:27 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-06-05 10:27:27 +0000 |
| commit | f9b00dbd5da7380ce172c56127c6fda15f86d8a5 (patch) | |
| tree | e2bfa45199679a625141b4347365e8ad4008cd86 | |
| parent | 7adfc4249cdfd46bd4bf39a080db238e99b5aba3 (diff) | |
| parent | 6b8e7a646a8cafdc6fa9b51a62638741bf3afb73 (diff) | |
| download | gitlab-ce-f9b00dbd5da7380ce172c56127c6fda15f86d8a5.tar.gz | |
Merge branch 'rs-projects-update-service-parity' into 'master'
Bring CE-EE parity to app/services/projects/update_service.rb
See merge request gitlab-org/gitlab-ce!19117
| -rw-r--r-- | app/services/projects/update_service.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/services/projects/update_service.rb b/app/services/projects/update_service.rb index 679f4a9cb62..0e489ec5e86 100644 --- a/app/services/projects/update_service.rb +++ b/app/services/projects/update_service.rb @@ -17,6 +17,8 @@ module Projects ensure_wiki_exists if enabling_wiki? + yield if block_given? + if project.update_attributes(params.except(:default_branch)) if project.previous_changes.include?('path') project.rename_repo @@ -53,8 +55,8 @@ module Projects def changing_default_branch? new_branch = params[:default_branch] - project.repository.exists? && - new_branch && new_branch != project.default_branch + new_branch && project.repository.exists? && + new_branch != project.default_branch end def enabling_wiki? |