root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
63,739 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

219 Commits

Author SHA1 Message Date
Douwe Maan 19a30595d9 Remove unnecessary comments 2017-09-25 10:23:43 +02:00
Douwe Maan b9857d8b66 Properly compare diff refs and diff positions when shas are truncated 2017-09-25 10:22:28 +02:00
Tiago Botelho 6d8e102c74 Adds cacheless render to Banzai object render 2017-09-06 15:35:35 +01:00
Alexis Reigel 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
Sean McGivern 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
Saverio Miroddi 83417865d0 Change a variable name in Commit#cherry_pick_description 2017-08-21 20:50:48 +02:00
Saverio Miroddi 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
Saverio Miroddi 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
Robert Speicher 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
Douwe Maan ba7251fefd Only create commit GPG signature when necessary 2017-08-16 18:57:50 +02:00
Saverio Miroddi 85aeb88438 Add support for start project to commit cherry-pick description 2017-08-15 21:17:52 +02:00
Saverio Miroddi 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
Saverio Miroddi 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
Robert Speicher 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
Saverio Miroddi 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
Alejandro Rodríguez 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
Alejandro Rodríguez c21ae07e33 Refactor Gitlab::Git::Commit to include a repository 2017-08-07 22:34:34 -04:00
Alexis Reigel eda001565c fetch gpg signature badges by ajax 2017-07-27 15:46:03 +02:00
Alexis Reigel 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
Alexis Reigel 8c4b6a32fc bail if the commit has no signature 2017-07-27 15:42:53 +02:00
Alexis Reigel 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
Alexis Reigel 2f956fae03 verify gpg commit using tmp keyring and db query 2017-07-27 15:42:53 +02:00
Alexis Reigel d1101ec02e use more descriptive variable names 2017-07-27 15:42:04 +02:00
Alexis Reigel 28bb5e3d53 commit signature with spec 2017-07-27 15:40:40 +02:00
Kevin O'Connor 817d9558fe Prototype key verification 2017-07-27 15:40:40 +02:00
Rémy Coutable 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
Lin Jen-Shin 3922b80329 Rename the methods to make it fit with current name 2017-07-18 18:04:20 +08:00
Lin Jen-Shin ffc5b29bd0 Follow feedback on the merge request 2017-07-18 17:48:48 +08:00
Andrew Newdigate a89f18bf2c Renamed Gitaly services 2017-07-18 07:59:36 +00:00
Lin Jen-Shin 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
Sean McGivern 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
Dmitriy Zaporozhets 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
Ahmad Sherif 204db05637 Re-enable Gitaly commit_raw_diffs migration 2017-06-07 16:55:45 +02:00
Robert Speicher 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
Robert Speicher 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
Rémy Coutable 4cfa5ce4a9
Enable the Style/PreferredHashMethods cop 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-06-02 19:11:26 +02:00
Rémy Coutable 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
Ahmad Sherif 4d1e987ec3 Use the new Gitaly CommitDiff RPC 2017-06-02 18:33:18 +02:00
Ahmad Sherif 99feed6e00 Add support for deltas_only under Gitaly 
Closes gitaly#199
 2017-05-13 18:27:06 +02:00
Alexander Randa fdba744986 Fix long urls in the title of commit 2017-05-12 11:45:26 +00:00
Jacob Vosmaer 27fb64d6a3 Remove deltas_only from DiffCollection 2017-05-11 16:01:10 +02:00
Rémy Coutable d40e1f547e Enable the Style/TrailingCommaInLiteral cop 
Use the EnforcedStyleForMultiline: no_comma option.

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-05-10 18:25:45 +02:00
Jacob Vosmaer 3107f2e460 Use Rails 'delegate' 2017-05-09 14:44:15 +02:00
Jacob Vosmaer f1a14d6857 Don't make Commit#raw_deltas private 2017-05-09 13:48:21 +02:00
Jacob Vosmaer 48254d187f Don't use DiffCollection for deltas 2017-05-09 12:27:17 +02:00
Ahmad Sherif 34cd109797 Re-enable Gitaly commit_raw_diff feature 2017-05-07 23:37:42 +02:00
Lin Jen-Shin 0a29bde4a1 Rename latest_pipeline to last_pipeline 
As it might be confusing that it's not the same as
Pipeline#latest

Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11038#note_28677090
 2017-05-03 01:40:49 +08:00
Lin Jen-Shin e69a7b95df Always show latest pipeline info in commit box 2017-05-03 00:17:53 +08:00
Douwe Maan 7f625f06d3 Pass project to Blob 2017-04-27 12:23:26 -05:00
Alejandro Rodríguez d6cc8feb6c Setup and run a Gitaly server for testing if GitalyClient is enabled 2017-04-11 16:00:44 -03:00