summaryrefslogtreecommitdiff
path: root/lib/api/commits.rb
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'webide-commit-use-correct-parent' into 'master'Nick Thomas2019-07-181-5/+9
|\ | | | | | | | | Use correct parent when committing in WebIDE See merge request gitlab-org/gitlab-ce!29598
| * Add start_sha to commits APIMarkus Koller2019-07-181-5/+9
| | | | | | | | | | | | | | | | | | | | When passing start_branch on committing from the WebIDE, it's possible that the branch has changed since editing started, which results in the change being applied on top of the latest commit in the branch and overwriting the new changes. By passing the start_sha instead we can make sure that the change is applied on top of the commit which the user started editing from.
* | Refactor RedisCounter and WebIdeCommitsCounterFrancisco Javier López2019-07-171-1/+1
|/ | | | | This MR refactor RedisCounter and WebIdeCommitsCounter to be reused by other components.
* Refactored WebIdeCommitsCount classFrancisco Javier López2019-07-161-1/+1
| | | | | | We're adding more redis base counters to the web ide and other classes. We're refactoring this class in other to use the logic in other places.
* Change HTTP Status Code when repository disabledSam Battalio2019-06-241-1/+4
|
* Add optional param :start_project to allow variable commit targetsKerri Miller2019-05-311-0/+10
| | | | | | | | This extends POST#:id/repository/commits to allow the optional parameter `:start_project`, which will allow targeting other projects besides the one derived from `:id`. Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/50850
* Accept force option on commit via APIPatrick Bajao2019-03-061-0/+1
| | | | | | | | When `force` is set to `true` and `start_branch` is set, the branch will be ovewritten with the new commit based on the `HEAD` of the `start_branch`. This commit includes changes to update the `gitaly-proto` gem.
* Merge branch 'security-commit-private-related-mr' into 'master'Yorick Peterse2019-03-041-1/+9
|\ | | | | | | | | | | | | Don't allow non-members to see private related MRs Closes #2787 See merge request gitlab/gitlabhq!2866
| * Modify MergeRequestsFinder to allow filtering by commitPatrick Bajao2019-01-281-1/+7
| |
| * Respond with 403 when non-member requests for private MRsPatrick Bajao2019-01-281-0/+2
| |
* | Add API endpoint to get a commit's GPG signatureBalasankar "Balu" C2019-02-141-0/+16
|/
* Fix API::Namespaces to accept namepaces with dotsif-52811-fix_namespaces_api_routingImre Farkas2018-11-281-1/+1
| | | | | It also renames the API::PROJECT_ENDPOINT_REQUIREMENTS constant to API::NAMESPACE_OR_PROJECT_REQUIREMENTS
* Revert API is going into 11.5, not 11.6.docs/rs-revert-api-versionRobert Speicher2018-11-141-1/+1
|
* Merge branch 'rs-cherry-pick-api' into 'master'Nick Thomas2018-11-091-3/+5
|\ | | | | | | | | | | | | Resolve possible cherry pick API race condition Closes #53773 See merge request gitlab-org/gitlab-ce!22946
| * Resolve possible cherry pick API race conditionrs-cherry-pick-apiRobert Speicher2018-11-091-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | Previously, we just fetched the latest commit for the given branch when presenting the resulting commit, but because something could have been committed to that branch between the time we cherry-picked and the time we render the result, the wrong commit could have been presented. Now, we fetch the commit object with the commit SHA returned by the commit change service, which should always be the correct commit. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53773
* | Add revert to commits APIRobert Speicher2018-11-091-0/+34
|/
* Includes commit stats in POST project commits API51803-include-commits-stats-in-projects-apiJacopo2018-10-031-1/+2
|
* Merge branch '45016-add-web-ide-commits-to-usage-ping' into 'master'Douwe Maan2018-10-031-0/+3
|\ | | | | | | | | | | | | Adds Web IDE commits to usage ping Closes #45016 See merge request gitlab-org/gitlab-ce!22007
| * Implements Web IDE commits counter in RedisTiago Botelho2018-10-031-1/+1
| | | | | | | | | | | | | | | | This makes a temporary implementation of the Web IDE commits counter using Redis while https://gitlab.com/gitlab-org/gitlab-ce/issues/52096 is being discussed further for a more generic approach to counters
| * Adds WebIDE commits to UsagePingTiago Botelho2018-10-011-0/+3
| | | | | | | | | | Implements UsageCounters model to track feature usage counters and makes easy to extend for future counters
* | Enable frozen string in lib/api and lib/backupgfyoung2018-09-291-0/+2
|/ | | | | | | | | | Partially addresses #47424. Had to make changes to spec files because stubbing methods on frozen objects is a mess in RSpec and leads to failures: https://github.com/rspec/rspec-mocks/issues/1190
* Adds chmod action to POST /projects/:id/repository/commits APIJacopo2018-09-271-1/+20
| | | | With this action the user can update the execute_filemode of a given file in the repository.
* Merge branch 'rubocop-code-reuse' into 'master'Robert Speicher2018-09-131-0/+2
|\ | | | | | | | | Add RuboCop cops to enforce code reusing rules See merge request gitlab-org/gitlab-ce!21391
| * Disable existing offenses for the CodeReuse copsYorick Peterse2018-09-111-0/+2
| | | | | | | | | | This whitelists all existing offenses for the various CodeReuse cops, of which most are triggered by the CodeReuse/ActiveRecord cop.
* | Resolve "500 Internal Server Error: Cherrypick commit with empty branch name"🙈 jacopo beschi 🙉2018-09-111-2/+2
|/
* API: Use find_branch! in all placesRobert Schilling2018-09-081-3/+2
|
* Allow collaboration with forks through the APIBob Van Landuyt2018-07-121-2/+14
| | | | | | | These APIs are used by the web IDE. They need to be on par with git & web access, allowing edits from maintainers to forks with merge requests that allow access.
* Added with_statsoption for GET /projects/:id/repository/commitsLeonid Batizhevskii2018-06-121-9/+13
|
* Allow merge requests related to a commit to be found via APIMark Fletcher2018-03-261-0/+14
| | | | | - Original work for the web interface here: - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13713
* Add specs42434-allow-commits-endpoint-to-work-over-all-commitsTiago Botelho2018-03-011-1/+1
|
* API method /projects/:id/repository/commits now works over every commitTiago Botelho2018-02-231-3/+6
|
* Add missing pagination on the commit diff endpointMaxime Roussin-Belanger2018-02-191-1/+4
|
* Refactor commits/refs API to use hash and add pagination headersRobert Schilling2018-02-141-12/+7
|
* Separate branch and tag namesRobert Schilling2018-02-091-4/+4
|
* Incorporate feedbackRobert Schilling2018-02-091-14/+15
|
* Basic ref fetching for commitsRobert Schilling2018-02-091-0/+25
|
* Add option to disable commit stats to commit APIFrancisco Javier López2018-01-091-1/+2
|
* Adds Rubocop rule for line break after guard clauseJacopo2017-11-161-0/+2
| | | | Adds a rubocop rule (with autocorrect) to ensure line break after guard clauses.
* Use Commit#notes and Note.for_commit_id when possible to make sure we use ↵dm-notes-for-commit-idDouwe Maan2017-11-081-1/+1
| | | | all the indexes available to us
* Merge branch 'sha-handling' into 'master'Douwe Maan2017-10-161-7/+5
|\ | | | | | | | | | | | | Adds requirements that supports anything in sha params Closes #26561 and #2709 See merge request gitlab-org/gitlab-ce!14462
| * Adds requirements that supports anything in sha paramsGuilherme Vieira2017-10-121-7/+5
| |
* | Move line code generation into Gitlab::Gitconflict-resolution-refactorAlejandro Rodríguez2017-10-121-1/+1
| | | | | | | | Having a distinct class just for that was a bit overkill
* | Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-121-1/+1
| | | | | | | | Rename classes to (hopefully) clearer names while we're doing that.
* | Move Gitlab::Diff::LineCode to module Gitlab::GitAlejandro Rodríguez2017-10-121-1/+1
| |
* | Remove 'Repo' prefix from API entitesVitaliy @blackst0ne Klachkov2017-10-051-9/+9
|/
* wip: fake its a binary diffmicael.bergeron2017-09-061-1/+1
|
* Fix the /projects/:id/repository/commits endpoint to handle dots in the ref ↵rc/fix-commits-apiRémy Coutable2017-08-081-16/+17
| | | | | | name when the project full path contains a `/` Signed-off-by: Rémy Coutable <remy@rymai.me>
* Fix batch commit APIDouwe Maan2017-08-041-1/+2
|
* Add start_branch to files and commits APIsDouwe Maan2017-08-041-2/+4
|
* Optimize creation of commit API by using Repository#commit instead of ↵sh-optimize-project-commit-apiStan Hu2017-07-031-1/+1
| | | | | | | | | Repository#commits Repository#commits is expensive because it has to use Rugged to walk the Git tree as opposed to doing a direct ref lookup. Improves performance in #34533
View Lorry Controller Status