Commit graph

9 commits

Author SHA1 Message Date
GitLab Bot
427b23c127 Add latest changes from gitlab-org/gitlab@master 2019-10-03 00:05:59 +00:00
GitLab Bot
538fff823d Add latest changes from gitlab-org/gitlab@master 2019-09-30 15:08:09 +00:00
Igor
351b39f172 Backport splitting approval changes from CE
Author and committers approvals are split in EE
This commit provides backports for those changes

This reverts commit 886f00bcba.
2019-04-02 11:01:07 +00:00
Thong Kuah
a2cfc150ce Add # frozen_string_literal to spec/models
Adds `# frozen_string_literal: true` to spec/models ruby files
2019-04-01 14:37:54 +13:00
Luke Duncalfe
38bf176c3c Enrich commits with full data in CommitCollection
Allow incomplete commit records to load their full data from gitaly.

Commits can be based on a Hash of data retrieved from PostgreSQL, and
this data can be intentionally incomplete in order to save space.

A new method #gitaly? has been added to Gitlab::Git::Commit, which
returns true if the underlying data source of the Commit is a
Gitaly::GitCommit.

CommitCollection now has a method #enrich which replaces non-gitaly
commits in place with commits from gitaly.

CommitCollection#without_merge_commits has been updated to call this
method, as in order to determine a merge commit we need to have parent
data.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/58805
2019-03-22 10:26:15 +13:00
Stan Hu
886f00bcba Backport commit author changes from CE
This backports the changes made in EE to fix merge request approvers
from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9574.
2019-02-15 05:58:23 -08:00
Luke Duncalfe
2b7dd017af Allow custom squash commit messages 2019-02-06 12:33:11 +00:00
Tiago Botelho
a2842241d4
Add committers and authors methods on MergeRequest
These are used by the EE-only approvers feature
2019-01-08 00:27:29 +01:00
Yorick Peterse
ab16a6fb34
Optimise getting the pipeline status of commits
This adds an optimised way of getting the latest pipeline status for a
list of Commit objects (or just a single one).
2017-11-16 16:01:14 +01:00