diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-03-18 10:13:26 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-03-18 10:13:26 +0000 |
| commit | a52d7dfaa9b72e4442a1723d30b84bc349b27215 (patch) | |
| tree | 7eb1fec0288fc7d40f6e5dd0cd3e0c672100dec0 /app | |
| parent | f696bacba2e09f4f4ea24b6f63fae0913f24d38a (diff) | |
| parent | da18211fec5ecb9581a5075d22adec743bb9f901 (diff) | |
| download | gitlab-ce-a52d7dfaa9b72e4442a1723d30b84bc349b27215.tar.gz | |
Merge branch 'sh-fix-issue-59065' into 'master'
Fix Error 500 when user commits Wiki page with no commit message
Closes #59065
See merge request gitlab-org/gitlab-ce!26247
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/project_wiki.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project_wiki.rb b/app/models/project_wiki.rb index c43bd45a62f..6ea0716c192 100644 --- a/app/models/project_wiki.rb +++ b/app/models/project_wiki.rb @@ -183,7 +183,7 @@ class ProjectWiki end def commit_details(action, message = nil, title = nil) - commit_message = message || default_message(action, title) + commit_message = message.presence || default_message(action, title) git_user = Gitlab::Git::User.from_gitlab(@user) Gitlab::Git::Wiki::CommitDetails.new(@user.id, |