summaryrefslogtreecommitdiff
path: root/app/models/commit.rb
Commit message (Collapse)AuthorAgeFilesLines
* Adds cacheless render to Banzai object render34509-improves-markdown-rendering-performance-for-commits-listTiago Botelho2017-09-061-0/+9
|
* pass whole commit to Gitlab::Gpg::Commit againAlexis Reigel2017-09-051-1/+1
| | | | | 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.
* Merge branch 'sm-cherry-pick-list-commits-in-message' into 'master'Sean McGivern2017-09-011-0/+22
|\ | | | | | | | | Add 'from commit' information to cherry-picked commits See merge request !13475
| * Change a variable name in Commit#cherry_pick_descriptionSaverio Miroddi2017-08-211-4/+4
| |
| * Reverse order of commits in MR cherry-pick messageSaverio Miroddi2017-08-211-1/+1
| | | | | | | | Also improved the UT for better documenting this change.
| * Correct the cherry-pick message for merge commitsSaverio Miroddi2017-08-171-10/+7
| | | | | | | | | | The list of commits must be generated from the merge request, not from a diff of the branches.
| * Add support for start project to commit cherry-pick descriptionSaverio Miroddi2017-08-151-4/+4
| |
| * Made commit cherry-pick message more standardSaverio Miroddi2017-08-151-11/+8
| | | | | | | | | | | | 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
| * Extracted cherry-pick description in ::CommitSaverio Miroddi2017-08-151-6/+10
| | | | | | | | This also fixes the inconsistency between non/merge commits in the number of newlines introduced.
| * Add 'from commit' information to cherry-picked commitsSaverio Miroddi2017-08-101-0/+24
| | | | | | | | | | | | Store the original commit in the commit message. In case of merge commit, the commits added to the start branch are also listed.
* | Merge branch 'dm-gpg-signature-performance' into 'master'Robert Speicher2017-08-161-1/+1
|\ \ | | | | | | | | | | | | Only create commit GPG signature when necessary See merge request !13561
| * | Only create commit GPG signature when necessarydm-gpg-signature-performanceDouwe Maan2017-08-161-1/+1
| |/
* | Whitelist or fix additional `Gitlab/PublicSend` cop violationsrs-more-public-send-whitelistsRobert Speicher2017-08-141-1/+1
|/ | | | | An upcoming update to rubocop-gitlab-security added additional violations.
* Move `deltas` and `diff_from_parents` logic to Gitlab::Git::CommitAlejandro Rodríguez2017-08-071-12/+2
| | | | | | This helps keep the abstraction layers simpler, and also keep the interface of those methods consistent, in case of implementation changes.
* Refactor Gitlab::Git::Commit to include a repositoryAlejandro Rodríguez2017-08-071-1/+2
|
* fetch gpg signature badges by ajaxAlexis Reigel2017-07-271-1/+7
|
* move signature cache read to Gpg::CommitAlexis Reigel2017-07-271-5/+0
| | | | | | | | 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.
* bail if the commit has no signatureAlexis Reigel2017-07-271-5/+1
|
* cache the gpg commit signatureAlexis Reigel2017-07-271-20/+5
| | | | | we store the result of the gpg commit verification in the db because the gpg verification is an expensive operation.
* verify gpg commit using tmp keyring and db queryAlexis Reigel2017-07-271-1/+16
|
* use more descriptive variable namesAlexis Reigel2017-07-271-5/+8
|
* commit signature with specAlexis Reigel2017-07-271-1/+1
|
* Prototype key verificationKevin O'Connor2017-07-271-0/+12
|
* Merge branch 'request-store-wrap' into 'master'Rémy Coutable2017-07-181-16/+3
|\ | | | | | | | | Add RequestCache to cache via RequestStore See merge request !12920
| * Rename the methods to make it fit with current nameLin Jen-Shin2017-07-181-1/+1
| |
| * Follow feedback on the merge requestLin Jen-Shin2017-07-181-1/+1
| |
| * Use RequestStoreWrap for Commit#authorLin Jen-Shin2017-07-181-16/+3
| | | | | | | | | | | | | | 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
* | Renamed Gitaly servicesAndrew Newdigate2017-07-181-2/+2
|/
* Add table for merge request commitsSean McGivern2017-07-061-1/+1
| | | | | | | | | | | 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.
* Merge branch '12614-fix-long-message' into 'master'Dmitriy Zaporozhets2017-06-081-16/+11
|\ | | | | | | | | | | | | Fix long urls in the title of commit Closes #12614 See merge request !10938
| * Fix long urls in the title of commitAlexander Randa2017-05-121-16/+11
| |
* | Re-enable Gitaly commit_raw_diffs migrationAhmad Sherif2017-06-071-6/+5
| |
* | Merge branch 'fix/use-new-gitaly-commit-diff-rpc' into 'master'Robert Speicher2017-06-021-5/+6
|\ \ | | | | | | | | | | | | Use the new Gitaly CommitDiff RPC See merge request !11826
| * | Use the new Gitaly CommitDiff RPCfix/use-new-gitaly-commit-diff-rpcAhmad Sherif2017-06-021-5/+6
| | |
* | | Merge branch 'rc/enable-PreferredHashMethods-cop' into 'master'Robert Speicher2017-06-021-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Enable the Style/PreferredHashMethods cop See merge request !11883
| * | | Enable the Style/PreferredHashMethods coprc/enable-PreferredHashMethods-copRémy Coutable2017-06-021-1/+1
| |/ / | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Lint our factories creation in addition to their build33139-lint-our-factoriesRémy Coutable2017-06-021-1/+1
|/ / | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Add support for deltas_only under GitalyAhmad Sherif2017-05-131-2/+10
| | | | | | | | Closes gitaly#199
* | Remove deltas_only from DiffCollectionJacob Vosmaer2017-05-111-4/+1
| |
* | Enable the Style/TrailingCommaInLiteral copRémy Coutable2017-05-101-1/+1
| | | | | | | | | | | | Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Use Rails 'delegate'Jacob Vosmaer2017-05-091-3/+1
| |
* | Don't make Commit#raw_deltas privateJacob Vosmaer2017-05-091-4/+4
| |
* | Don't use DiffCollection for deltasJacob Vosmaer2017-05-091-1/+5
| |
* | Re-enable Gitaly commit_raw_diff featureAhmad Sherif2017-05-071-7/+8
| |
* | Rename latest_pipeline to last_pipelinealways-show-latest-pipeline-in-commit-boxLin Jen-Shin2017-05-031-2/+2
| | | | | | | | | | | | | | | | 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
* | Always show latest pipeline info in commit boxLin Jen-Shin2017-05-031-1/+1
| |
* | Pass project to BlobDouwe Maan2017-04-271-1/+1
|/
* Setup and run a Gitaly server for testing if GitalyClient is enabledgitaly-testingAlejandro Rodríguez2017-04-111-8/+7
|
* Add option to start a new discussion on an MRDouwe Maan2017-04-051-0/+5
|
* Merge branch 'feature/use-gitaly-for-commit-show' into 'master'Robert Speicher2017-03-171-1/+8
|\ | | | | | | | | Use Gitaly for CommitController#show See merge request !9629