Add latest changes from gitlab-org/gitlab@master

2 files changed, 6 insertions, 4 deletions

diff --git a/app/services/git/base_hooks_service.rb b/app/services/git/base_hooks_service.rb
index 1eb54e13522..aee2f685e97 100644
--- a/app/services/git/base_hooks_service.rb
+++ b/app/services/git/base_hooks_service.rb
@@ -25,6 +25,7 @@ module Git
       raise NotImplementedError, "Please implement #{self.class}##{__method__}"
     end
 
+    # The changeset, ordered with the newest commit last
     def commits
       raise NotImplementedError, "Please implement #{self.class}##{__method__}"
     end
@@ -132,10 +133,10 @@ module Git
     end
 
     def event_push_data
-      # We only need the last commit for the event push, and we don't
+      # We only need the newest commit for the event push, and we don't
       # need the full deltas either.
       @event_push_data ||= Gitlab::DataBuilder::Push.build(
-        **push_data_params(commits: commits.last, with_changed_files: false)
+        **push_data_params(commits: limited_commits.last, with_changed_files: false)
       )
     end
 
diff --git a/app/services/git/branch_hooks_service.rb b/app/services/git/branch_hooks_service.rb
index 9738615c804..7a22d7ffcdf 100644
--- a/app/services/git/branch_hooks_service.rb
+++ b/app/services/git/branch_hooks_service.rb
@@ -21,8 +21,9 @@ module Git
     def commits
       strong_memoize(:commits) do
         if creating_default_branch?
-          # The most recent PROCESS_COMMIT_LIMIT commits in the default branch
-          project.repository.commits(newrev, limit: PROCESS_COMMIT_LIMIT)
+          # The most recent PROCESS_COMMIT_LIMIT commits in the default branch.
+          # They are returned newest-to-oldest, but we need to present them oldest-to-newest
+          project.repository.commits(newrev, limit: PROCESS_COMMIT_LIMIT).reverse
         elsif creating_branch?
           # Use the pushed commits that aren't reachable by the default branch
           # as a heuristic. This may include more commits than are actually