summaryrefslogtreecommitdiff
path: root/lib/api/files.rb
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-08-22 08:31:30 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-08-22 08:31:30 +0000
commit1c9d26b538ba71c07bc33d6410cc756686a0fcb1 (patch)
treede2de76a2cff33d60e7a3c063f77883d6c6b9573 /lib/api/files.rb
parent0ce1355273a2f9158d700badb6f9ac1b30fd26e7 (diff)
parenta2997ce1cfd470e59c2c10d1ab9285bafce234b8 (diff)
downloadgitlab-ce-1c9d26b538ba71c07bc33d6410cc756686a0fcb1.tar.gz
Merge branch 'api-empty-commit-message' into 'master'
API: Catch empty commit messages Closes #50268, #50266, and #50265 See merge request gitlab-org/gitlab-ce!21322
Diffstat (limited to 'lib/api/files.rb')
-rw-r--r--lib/api/files.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/files.rb b/lib/api/files.rb
index 29d7489bd7c..ff4f75c12df 100644
--- a/lib/api/files.rb
+++ b/lib/api/files.rb
@@ -59,7 +59,7 @@ module API
params :simple_file_params do
requires :file_path, type: String, desc: 'The url encoded path to the file. Ex. lib%2Fclass%2Erb'
requires :branch, type: String, desc: 'Name of the branch to commit into. To create a new branch, also provide `start_branch`.'
- requires :commit_message, type: String, desc: 'Commit message'
+ requires :commit_message, type: String, allow_blank: false, desc: 'Commit message'
optional :start_branch, type: String, desc: 'Name of the branch to start the new commit from'
optional :author_email, type: String, desc: 'The email of the author'
optional :author_name, type: String, desc: 'The name of the author'