Skip to content
Snippets Groups Projects

Add triggers API

Merged Tomasz Maczukin requested to merge ci/api-triggers into master

References #4264 (closed)

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Author Maintainer

    @ayufan I think that this feature is ready for review

  • Tomasz Maczukin Added 1 commit:

    Added 1 commit:

  • I woudl prefer to use token instead of trigger_id to manage the trigger.

  • Tomasz Maczukin Added 1 commit:

    Added 1 commit:

    • e0ec69d9 - Change 'trigger_id' to 'token' as resource ID in triggers API
  • @DouweM @rspeicher Can you review?

  • Tomasz Maczukin Added 1 commit:

    Added 1 commit:

    • 34d60de3 - Add some fixes after review
  • Tomasz Maczukin Added 1 commit:

    Added 1 commit:

    • d44653da - Add some fixes after review
  • Tomasz Maczukin Title changed from [WIP] Add triggers API to Add triggers API

    Title changed from [WIP] Add triggers API to Add triggers API

  • Check @axil's ongoing documentation styleguide MR and make sure these API docs conform to the standard.

  • Tomasz Maczukin Added 440 commits:

    Added 440 commits:

    • d44653da...0e344aa2 - 437 commits from branch master
    • 6201a5dd - Merge branch 'master' into ci/api-triggers
    • a31bd940 - Modify triggers API documentation style [ci skip]
    • 58b7ce65 - Update CHANGELOG {ci skip]
  • Author Maintainer

    @DouweM @rspeicher: Triggers entry in API documentation index prefixed, documentation style changed. CHANGELOG updated.

    If there are no more comments, then ready for merging :)

  • Copying from my comment in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2264#note_3199256

    Some general advice (which I forgot to document, so it's my fault):

    Do not add headings for Parameters, Example of request and Example of response, add only for the main calls. Always imagine that the headings end up being referenced in doc.gitlab.com. How would you know what is referenced if your URL is api/build_variables.md#parameters ? If you have multiple times the same heading you would not know where to go.

    Other than that I'll leave some inline comments.

  • 1 # Build triggers
    2
  • Tomasz Maczukin Title changed from Add triggers API to [WIP] Add triggers API

    Title changed from Add triggers API to [WIP] Add triggers API

  • Tomasz Maczukin Added 6 commits:

    Added 6 commits:

    • 99393cde - Version 8.4.0.rc1
    • d139276a - Merge branch 'master' into 8-4-stable
    • 633ac134 - Modify triggers API documentation style [ci skip]
    • 57a67c4f - Merge branch '8-4-stable' into ci/api-triggers
    • d8359a4f - Update CHANGELOG [ci skip]
    • c5b429f0 - Add mofications to triggers API documentation [ci skip]
  • Tomasz Maczukin Target branch changed from master to 8-4-stable

    Target branch changed from master to 8-4-stable

  • Tomasz Maczukin Title changed from [WIP] Add triggers API to Add triggers API

    Title changed from [WIP] Add triggers API to Add triggers API

  • Author Maintainer

    @axil: documentation is fixed

    @rspeicher @DouweM: if there are no more comments, then ready to be merged. As we agreeded with Robert, the MR is pointing to 8-4-stable. After merge it should be picked to master.

    Edited by Tomasz Maczukin
  • Tomasz Maczukin Target branch changed from 8-4-stable to master

    Target branch changed from 8-4-stable to master

  • Tomasz Maczukin Added 41 commits:

    Added 41 commits:

  • Author Maintainer

    @DouweM: target branch switched back to master. All conflicts resolved.

  • Douwe Maan Enabled an automatic merge when the build for 41eedd45 succeeds

    Enabled an automatic merge when the build for 41eedd45 succeeds

  • Tomasz Maczukin Added 24 commits:

    Added 24 commits:

  • Author Maintainer

    @DouweM I needed to resolve conflicts again and I see that my latest commit disabled the 'automatic merge', that was waiting for build to finish. Can you merge it manually? All is 'green' right now :)

  • @tmaczukin We still have:

    This merge request contains merge conflicts

  • Tomasz Maczukin Added 175 commits:

    Added 175 commits:

  • Author Maintainer

    @ayufan Builds MR was merged first - that generated new conflicts. Resolved. I've also removed duplicate from CHANGELOG (variables features for API was entered two times).

    Ready to merge - again :)

  • Kamil Trzcińśki Status changed to merged

    Status changed to merged

  • mentioned in commit 948bb655

  • Picked into 8-4-stable.

  • mentioned in commit c7ee7eea

  • mentioned in issue #4218 (closed)

  • mentioned in issue #10852 (closed)

  • mentioned in issue #10421 (moved)

  • Please register or sign in to reply
    Loading