home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-27 13:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
30,219 Commits 48 Branches 340 Tags
b2dc9176018729efc1969035b30017c2ed81a708
Commit Graph
60 Commits
Author SHA1 Message Date
Stan Hu a85dde9182 Fix Error 500 when using closes_issues API with an external issue tracker 
Closes #18484
 2016-06-11 19:50:08 -07:00
Sean McGivern d863d86aeb Add sha parameter to MR accept API 
The `sha` parameter is optional, and when present, must match the
current HEAD SHA of the source branch. Otherwise, the API call fails
with a 409 Conflict and a message containing the current HEAD for the
source branch.

Also tidy up some doc wording.
 2016-06-01 20:29:54 +01:00
Rémy Coutable f5240f9703 Expose MergeRequest#user_notes_count in the API and use the method in issues list 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-05-09 16:08:07 +02:00
Robert Schilling a9200d93d3 Ensure that issues and merge requests are found 2016-04-13 17:15:42 +02:00
Robert Schilling fa3009095f Make subscription API more RESTful 2016-04-13 13:52:13 +02:00
Robert Schilling f875189b39 API: Ability to subscribe and unsubscribe from a merge request 2016-04-13 13:45:01 +02:00
Robert Schilling fb2fde9d62 API: Expose subscribed? on issues 2016-04-08 15:53:04 +02:00
Zeger-Jan van de Weg d28a587e82 Fix typos and denting 2016-03-21 19:30:45 +01:00
Zeger-Jan van de Weg 3b088fc5b5 Minor improvements on IssuableActions 2016-03-21 16:59:35 +01:00
Zeger-Jan van de Weg 7342a4566c Dry destroy action on issuables 2016-03-19 21:24:05 +01:00
Zeger-Jan van de Weg 212e83bab3 Soft delete issuables 2016-03-19 21:23:03 +01:00
bb-froggy 2af778c4fa typo 2016-03-02 09:42:14 +00:00
Douwe Maan 0807bd5130 Merge branch 'skakirill/gitlab-ce-api-merge-request-setup-milestone' into 'master' 
API: Allow to set or update a merge-request's milestone

_Originally opened at !2107 by @ skakirill._

- - -


See merge request !2755
 2016-02-12 08:39:18 +00:00
Rémy Coutable 973a7d040e Merge branch 'Schniz/gitlab-ce-feature/merge-request-closes-issues-in-api' into 'master' 
Add merge_requests/:merge_request_id/closes_issues

_Originally opened at !2660 by @Schniz._

- - -

Added `/api/v3/projects/:id/merge_requests/:merge_request_id/closes_issues` route in the API for getting the issues that should be closed when a merge request merged successfully

See merge request !2779
 2016-02-11 17:13:36 +00:00
Gal SchlezingerandRémy Coutable 78e36780be Added '/api/v3/projects/:id/merge_requests/:merge_request_id/closes_issues' route in the API 
Added some documentation for it

Added to changelog

Added curl example and an attribute table

Moved the api route definition from "lib/api/issues.rb" to "lib/api/merge_requests.rb"

Fixed the attributes and changed the documentation to be at "merge_requests.md" too

Changed generic titles to more specific titles

added an underscore

added tests. it depends on a newer version of gitlab-test project
I'm doing a  since I need to add a branch to the `gitlab-test` repo

removed the before

using 'iid' instead of 'id' in the description to reference the issues. that makes the tests pass

Removed the 'closes-issues' key from test_env. so it should pass the tests

Moved the two initializations to the describe block

Changed the changelog
 2016-02-11 09:34:07 +01:00
Rémy Coutable f6a666bdc2 Add an API spec for MergeRequest#merge_status and properly document this resource 2016-02-08 17:18:44 +01:00
Kirill SkachkovandRémy Coutable 81f2a9e5b0 API: Allow to set or update a merge-request's milestone 2016-02-08 15:49:35 +01:00
Dmitriy Zaporozhets dfb8803c1c Improve consistency and duplication for Merge Request API 
* Follow REST for merge request API route
* Remove repeating comments API for MR

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-28 14:26:12 +01:00
Valery Sizov 83d42c1518 Revert upvotes and downvotes params to MR API 2015-12-28 11:41:16 +02:00
Zeger-Jan van de Weg 0e96d6eb10 Merge branch 'master' into merge-if-green 2015-12-07 10:06:07 +01:00
Dmitriy Zaporozhets c366e81da7 Improve docs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-04 11:26:35 +01:00
Dmitriy Zaporozhets 0b68a0e79e Add API endpoint to fetch merge request commits list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-04 11:08:10 +01:00
Dmitriy Zaporozhets 0ccd7de7f3 Fix wrong doc in merge request API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-04 10:55:36 +01:00
Zeger-Jan van de Weg 8608c6325e Refactor MergeWhenBuildSucceedsService and incorporate feedback 2015-11-23 10:11:54 +01:00
Robert Schilling 26b12e2c37 Add upvote/downvote fields to merge request and note API to preserve compatibility 2015-11-21 21:36:31 +01:00
Valery Sizov fd2c0fe446 award emoji 2015-11-19 01:25:27 +02:00
Zeger-Jan van de Weg 2f048df4a4 API support, incorporated feedback 2015-11-18 11:17:41 +01:00
sue445 2297a7ba1f [ci skip] Add missing parameters in API doc 2015-10-14 00:45:11 +09:00
Marin Jankovski 9b6f1c5948 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-16 12:11:25 +02:00
Robin Burchell 6f581841d5 Remove author information from "post" in merge_requests API. 
From both experimenting with the API and reading the source code, this appears to not be used at all.

My guess is this was copypasta from somewhere else.
 2015-07-13 18:54:15 +02:00
Ben Boeckel 414cacd7f4 api: expose work_in_progress flag 2015-07-10 10:33:43 -04:00
Stan Hu 85145d1d77 Disable changing of the source branch in merge request update API 2015-05-29 09:40:35 -07:00
jubianchi 2c544d43c8 Query issues, merge requests and milestones with their IID through API 2015-05-02 10:44:52 +02:00
Stan Hu fad71576f9 Fix cross references when usernames, milestones, or project names contain underscores. 
Remove emphasis from system notes to avoid Markdown conflicts in names.
 2015-03-19 07:07:30 -07:00
Dmitriy Zaporozhets bdfb349ff7 Refactor and improve sorting objects in API for projects, issues and merge requests 2015-02-05 22:00:54 -08:00
Jeroen van Baarsen b60d06eb2c Added a way to retrieve MR files 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-02-04 10:24:25 +01:00
Loic Dachary 5bd463c1d2 Add description to merge request 
The description can be provided when creating or updating a merge
request.

Signed-off-by: Loic Dachary <loic@dachary.org>
 2015-01-18 14:09:56 +01:00
Marin Jankovski b99b2e60d5 Ordering and sorting for MR in api. 2014-09-15 11:54:49 +02:00
James Brooks 3f36f84c1f Consistency, spelling and grammar 2014-08-15 15:03:01 +01:00
Dmitriy Zaporozhets 433dac7799 Merge pull request #7465 from Razer6/better_label_color_validation 
Better label color validation, fixes #7454
 2014-08-15 10:17:16 +03:00
Robert Schilling cbc90565b5 Do label validation for issues/merge requests API 2014-08-14 10:17:52 +02:00
mabdullah-cinglevue 4a36d669b5 # This is a combination of 2 commits. 
# The first commit's message is:

Patched `MergeRequest` to return more data.

Patched `MergeRequest` to return the `description` & `milestone`
Conflicts:
	lib/api/entities.rb

# This is the 2nd commit message:

Update merge_requests.md

Update documentation for merge request endpoint adding support for description.
 2014-08-01 18:29:23 +08:00
Dmitriy Zaporozhets c86962e098 Change deafult admin email to example.com 2014-07-19 14:27:01 +03:00
Ciro Santilli fd348de76d Update docs to markdown style guide. 2014-06-03 23:16:31 +02:00
Marin Jankovski f22c709539 Add titles to doc pages. 2014-05-27 14:12:15 +02:00
Dmitriy Zaporozhets 5880d7df62 Docs for merge api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-12 18:01:22 +03:00
dosire 5bf12bbb1d Make clear that notes also serve as comments. 2014-04-30 17:28:05 +02:00
Hidde Boomsma 2a944b1d9f added target_project_id to merge_requests.md 
Added description about optional field target_project_id for merge requests.
 2014-04-22 15:35:09 +02:00
Stuart Pook 66209fbc76 Add optional parameter to list merge requests 
Add an optional parameter to list merge requests to restrict the
returned merge requests to those that are "opened", "merged" or
"closed". By default all merge requests are returned. Note that
"all" can be given to explicitly request all merge requests.
 2014-04-07 16:18:25 +02:00
Johannes Schleifenbaum 49addad7b5 Api-Doc JSON lint 
Fixes: #5505
 2014-04-05 08:37:42 +02:00