eef63813ea
stop ProcessCommitWorker from processing MR merge commit
...
When a merge request is merged, it creates a commit with the
description of the MR, which may contain references and issue
closing references. As this will be handled in the PostMergeService
anyways, let's ignore merge commit generated from a MR.
2018-02-16 13:51:19 -05:00
b0b4ae1875
API - Include project in commits&blobs search results
2018-02-14 09:00:26 +01:00
f32f04a50f
Migrate Commit#uri_type to Gitaly
...
Closes gitaly#915
2018-01-15 14:16:22 +01:00
a7d26f00c3
Display related merge requests in commit detail page
2018-01-12 20:38:36 +00:00
f3cf8cc8d1
Only search for MR revert commits on notes after MR was merged
...
If we search for notes before the MR was merged, we have to load every commit
that was ever part of the MR, or mentioned in a push. In extreme cases, this can
be tens of thousands of commits to load, but we know they can't revert the merge
commit, because they are from before the MR was merged.
In the (rare) case that we don't have a `merged_at` value for the MR, we can
still search all notes.
2018-01-12 13:19:05 +00:00
ac2cb65ab3
Remove the Commit#tree method
2018-01-04 18:00:28 +01:00
c6edae3887
Load commit in batches for pipelines#index
...
Uses `list_commits_by_oid` on the CommitService, to request the needed
commits for pipelines. These commits are needed to display the user that
created the commit and the commit title.
This includes fixes for tests failing that depended on the commit
being `nil`. However, now these are batch loaded, this doesn't happen
anymore and the commits are an instance of BatchLoader.
2017-12-19 10:05:40 +01:00
55f322085d
Adds ordering to projects contributors in API
...
Allows ordering in GET api/v4/projects/:project_id/repository/contributors
through `order_by` and `sort` params.
The available `order_by` options are: name|email|commits.
The available `sort` options are: asc|desc.
2017-12-13 18:02:20 +01:00
cb6f51ec9b
add support for the commit reference filter
2017-12-07 09:01:37 -05:00
e826c5d091
Fix link text from group context
2017-11-23 12:59:14 +01:00
f9565e3039
Batchload blobs for diff generation
...
After installing a new gem, batch-loader, a construct can be used to
queue data to be fetched in bulk. The gem was also introduced in both
gitlab-org/gitlab-ce!14680 and gitlab-org/gitlab-ce!14846 , but those mrs
are not merged yet.
For the generation of diffs, both the old blob and the new blob need to
be loaded. This for every file in the diff, too. Now we collect all
these so we do 1 fetch. Three `.allow_n_plus_1_calls` have been removed,
which I expect to be valid, but this needs to be confirmed by a full CI
run.
Possibly closes:
- https://gitlab.com/gitlab-org/gitlab-ce/issues/37445
- https://gitlab.com/gitlab-org/gitlab-ce/issues/37599
- https://gitlab.com/gitlab-org/gitlab-ce/issues/37431
2017-11-21 13:53:26 +01:00
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
19a30595d9
Remove unnecessary comments
2017-09-25 10:23:43 +02:00
b9857d8b66
Properly compare diff refs and diff positions when shas are truncated
2017-09-25 10:22:28 +02:00
6d8e102c74
Adds cacheless render to Banzai object render
2017-09-06 15:35:35 +01:00
508ff17b34
pass whole commit to Gitlab::Gpg::Commit again
...
we need the commit object for the updated verification that also checks
the committer's email to match the gpg key and user's emails.
2017-09-05 12:18:31 +02:00
096850a49a
Merge branch 'sm-cherry-pick-list-commits-in-message' into 'master'
...
Add 'from commit' information to cherry-picked commits
See merge request !13475
2017-09-01 10:24:29 +00:00
83417865d0
Change a variable name in Commit#cherry_pick_description
2017-08-21 20:50:48 +02:00
9ec358af7b
Reverse order of commits in MR cherry-pick message
...
Also improved the UT for better documenting this change.
2017-08-21 20:47:18 +02:00
c0f921606c
Correct the cherry-pick message for merge commits
...
The list of commits must be generated from the merge request,
not from a diff of the branches.
2017-08-17 22:38:47 +02:00
ec34b2d051
Merge branch 'dm-gpg-signature-performance' into 'master'
...
Only create commit GPG signature when necessary
See merge request !13561
2017-08-16 18:34:55 +00:00
ba7251fefd
Only create commit GPG signature when necessary
2017-08-16 18:57:50 +02:00
85aeb88438
Add support for start project to commit cherry-pick description
2017-08-15 21:17:52 +02:00
e33608d8e4
Made commit cherry-pick message more standard
...
Follow the `cherry pick -x` format for the first line, and the
interactive rebase format for the commits in the merge, in case
of merge commit
2017-08-15 19:57:40 +02:00
3d7febc01c
Extracted cherry-pick description in ::Commit
...
This also fixes the inconsistency between non/merge commits in the number of newlines introduced.
2017-08-15 19:35:28 +02:00
260c8da060
Whitelist or fix additional `Gitlab/PublicSend` cop violations
...
An upcoming update to rubocop-gitlab-security added additional
violations.
2017-08-14 12:14:11 -04:00
1d6ba59702
Add 'from commit' information to cherry-picked commits
...
Store the original commit in the commit message. In case of
merge commit, the commits added to the start branch are also
listed.
2017-08-10 21:18:22 +02:00
e363fbf71a
Move `deltas` and `diff_from_parents` logic to Gitlab::Git::Commit
...
This helps keep the abstraction layers simpler, and also keep the
interface of those methods consistent, in case of implementation
changes.
2017-08-07 23:33:40 -04:00
c21ae07e33
Refactor Gitlab::Git::Commit to include a repository
2017-08-07 22:34:34 -04:00
eda001565c
fetch gpg signature badges by ajax
2017-07-27 15:46:03 +02:00
34810acd6c
move signature cache read to Gpg::Commit
...
as we write the cache in the gpg commit class already the read should
also happen there.
This also removes all logic from the main commit class, which just
proxies the call to the Gpg::Commit now.
2017-07-27 15:42:53 +02:00
8c4b6a32fc
bail if the commit has no signature
2017-07-27 15:42:53 +02:00
69e511c4c2
cache the gpg commit signature
...
we store the result of the gpg commit verification in the db because the
gpg verification is an expensive operation.
2017-07-27 15:42:53 +02:00
2f956fae03
verify gpg commit using tmp keyring and db query
2017-07-27 15:42:53 +02:00
d1101ec02e
use more descriptive variable names
2017-07-27 15:42:04 +02:00
28bb5e3d53
commit signature with spec
2017-07-27 15:40:40 +02:00
817d9558fe
Prototype key verification
2017-07-27 15:40:40 +02:00
f3e682c03f
Merge branch 'request-store-wrap' into 'master'
...
Add RequestCache to cache via RequestStore
See merge request !12920
2017-07-18 12:09:47 +00:00
3922b80329
Rename the methods to make it fit with current name
2017-07-18 18:04:20 +08:00
ffc5b29bd0
Follow feedback on the merge request
2017-07-18 17:48:48 +08:00
a89f18bf2c
Renamed Gitaly services
2017-07-18 07:59:36 +00:00
aada5273fa
Use RequestStoreWrap for Commit#author
...
We also try to use instance variable to cache the result if
RequestStore is not available, so we could keep the same logic,
using the same cache key. Also introduce a way to specify method
specific cache key
2017-07-18 01:18:20 +08:00
aff5c9f3e5
Add table for merge request commits
...
This is an ID-less table with just three columns: an association to the merge
request diff the commit belongs to, the relative order of the commit within the
merge request diff, and the commit SHA itself.
Previously we stored much more information about the commits, so that we could
display them even when they were deleted from the repo. Since 8.0, we ensure
that those commits are kept around for as long as the target repo itself is, so
we don't need to duplicate that data in the database.
2017-07-06 17:36:10 +01:00
8ce11fc388
Merge branch '12614-fix-long-message' into 'master'
...
Fix long urls in the title of commit
Closes #12614
See merge request !10938
2017-06-08 10:32:45 +00:00
204db05637
Re-enable Gitaly commit_raw_diffs migration
2017-06-07 16:55:45 +02:00
993412f9de
Merge branch 'fix/use-new-gitaly-commit-diff-rpc' into 'master'
...
Use the new Gitaly CommitDiff RPC
See merge request !11826
2017-06-02 19:39:02 +00:00
3cdac884c7
Merge branch 'rc/enable-PreferredHashMethods-cop' into 'master'
...
Enable the Style/PreferredHashMethods cop
See merge request !11883
2017-06-02 19:00:28 +00:00
4cfa5ce4a9
Enable the Style/PreferredHashMethods cop
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-06-02 19:11:26 +02:00
857d039145
Lint our factories creation in addition to their build
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-06-02 19:06:50 +02:00
4d1e987ec3
Use the new Gitaly CommitDiff RPC
2017-06-02 18:33:18 +02:00
Micaël Bergeron
Jarka Kadlecová
Ahmad Sherif
Hiroyuki Sato
Sean McGivern
Jacob Vosmaer
Zeger-Jan van de Weg
Jacopo
micael.bergeron
Yorick Peterse
Douwe Maan
Tiago Botelho
Alexis Reigel
Sean McGivern
Saverio Miroddi
Robert Speicher
Robert Speicher
Alejandro Rodríguez
Kevin O'Connor
Rémy Coutable
Lin Jen-Shin
Andrew Newdigate
Dmitriy Zaporozhets