Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 19 insertions, 0 deletions

diff --git a/spec/requests/api/commits_spec.rb b/spec/requests/api/commits_spec.rb
index ac3aa808f37..1162ae76d15 100644
--- a/spec/requests/api/commits_spec.rb
+++ b/spec/requests/api/commits_spec.rb
@@ -284,6 +284,18 @@ RSpec.describe API::Commits do
           end
         end
       end
+
+      context 'with the optional trailers parameter' do
+        it 'includes the Git trailers' do
+          get api("/projects/#{project_id}/repository/commits?ref_name=6d394385cf567f80a8fd85055db1ab4c5295806f&trailers=true", current_user)
+
+          commit = json_response[0]
+
+          expect(commit['trailers']).to eq(
+            'Signed-off-by' => 'Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>'
+          )
+        end
+      end
     end
   end
 
@@ -1503,6 +1515,13 @@ RSpec.describe API::Commits do
           expect(json_response).to eq("dry_run" => "success")
           expect(project.commit(branch)).to eq(head)
         end
+
+        it 'supports the use of a custom commit message' do
+          post api(route, user), params: { branch: branch, message: 'foo' }
+
+          expect(response).to have_gitlab_http_status(:created)
+          expect(json_response["message"]).to eq('foo')
+        end
       end
 
       context 'when repository is disabled' do