home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-09 20:56:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,867 Commits 48 Branches 340 Tags
ce_upstream
Commit Graph
423 Commits
Author SHA1 Message Date
Patricio Cano edc6d00bf8 License information can now be retrieved via the API 2015-11-30 13:03:29 -05:00
Robert Speicher 698455466a Merge remote-tracking branch 'ce/8-2-stable' into 8-2-stable-ee 2015-11-21 23:13:20 -05:00
Robert SpeicherandRobert Speicher 94b33caf84 Merge branch 'fix-award-emoji-api' into 'master' 
Add upvote/downvote fields to merge request and note API to preserve compatibility

As discussed in !1825 we should not break the API compatibility.

* This MR adds the fields `upvotes`/`downvotes` to the merge request API again, which always return `0`.
* Add the fields `upvote`/`downvote` to the notes API, which always return `false`

This behavior is documented in the API docs.

See merge request !1867
 2015-11-21 22:46:18 -05:00
Stan HuandRobert Speicher 27821ce01f Merge branch 'consistent-tags-api' into 'master' 
Make tag API for release feature consistent

Make tags API consistent with other tags methods. This changes the endpoint from `PUT /projects/:id/repository/:tag/release` to `PUT /projects/:id/repository/tags/:tag_name/release`.

On thing the API is still missing, is an error if the tag does not exist. Right now it returns 200 even the tag does not exist. I'll fix that such it returns 404.

@stanhu Can you review?
@rspeicher This MR should go into 8.2

See merge request !1864
 2015-11-21 22:38:13 -05:00
Robert Speicher 115bbd8a00 Merge remote-tracking branch 'ce/8-2-stable' into 8-2-stable-ee 2015-11-21 12:19:45 -05:00
Robert SpeicherandRobert Speicher 81134fd03a Merge branch 'api-tags-doc' into 'master' 
Add tags page to readme

The tags page was separated for the release feature but not to the index readme.

[ci skip]

See merge request !1861
 2015-11-21 10:50:56 -05:00
Dmitriy Zaporozhets 1f4dc0b14c Merge branch '8-2-stable' of gitlab.com:gitlab-org/gitlab-ce into 8-2-stable-ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-20 14:05:09 +01:00
Dmitriy ZaporozhetsandRobert Speicher 48e86ec610 Merge branch 'emoji_votes' into 'master' 
Award Emoji

This it first iteration of award emoji feature.
We have plan to extend emoji picker by the next release.

For now, you can add award by clicking to the emoji picker or posting a regular comment with emoji like "👍" and any other. You can post not only emoji that listed in the emoji picker.

See merge request !1825
 2015-11-19 19:50:58 -05:00
Robert Speicher ed2a8ba600 Merge 8-2-stable into 8-2-stable-ee 
Conflicts remaining:

- app/controllers/groups/group_members_controller.rb
- app/controllers/projects/project_members_controller.rb
- app/models/ability.rb
- app/models/member.rb
- app/models/project.rb
 2015-11-19 10:33:18 -05:00
Den Girnyk 4de50a866e Fix md syntax in doc/api/commits.md 2015-11-17 13:08:11 +02:00
Valery Sizov 7d7691cd09 Merge remote-tracking branch 'origin/master' into ce-to-ee 2015-11-16 13:37:13 +02:00
Dmitriy Zaporozhets a43a218c98 Merge branch 'releases-feature' 2015-11-16 10:18:32 +01:00
Dmitriy Zaporozhets 743d66e4da Improve english text 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 10:11:16 +01:00
Robert Speicher 37fe73c337 Merge remote-tracking branch 'ce/master' into ce-to-ee 2015-11-15 00:30:17 -05:00
Robert Speicher 6afca45028 Merge remote-tracking branch 'ce/master' into ce-to-ee 2015-11-13 12:34:34 -05:00
Kamil Trzcinski 6384c757b7 Expose CI enable option in project features 
- Enable CI by default for all new projects
 2015-11-13 10:52:50 +01:00
Dmitriy Zaporozhets 8f53094f0f Add API docs and correctly expose release api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-12 23:52:02 +01:00
Dmitriy Zaporozhets a5ab56fd91 Move git tags API to separate file 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-12 15:41:13 +01:00
Valery Sizov 93bcc9ca7f Merge remote-tracking branch 'origin/master' into ce_upsteram 2015-11-05 14:26:35 +02:00
Stan Hu 91cbf9db0c Add allow_failure field to commit status API 
Closes #3196
 2015-11-03 20:41:19 -08:00
Valery SizovandValery Sizov 1b8d324762 Add ability to fetch the commit ID of the last commit that actually touched a file 2015-11-02 17:07:06 +02:00
Valery Sizov 8766c54bf2 Merge remote-tracking branch 'origin/master' into ce_upstream_15_10 2015-10-15 16:46:48 +03:00
sue445 2297a7ba1f [ci skip] Add missing parameters in API doc 2015-10-14 00:45:11 +09:00
Kamil Trzcinski 69c04498ef Small bug fixes 2015-10-12 15:55:12 +02:00
Kamil Trzcinski 0aefeeb882 Add Commit Status documentation 2015-10-12 12:42:27 +02:00
Kamil Trzcinski 914cfbd2f1 Implement Commit Status API 2015-10-12 11:53:49 +02:00
Valery Sizov b7cc9bb531 Abiliy to disable 'Share with Group' feature 2015-10-01 09:47:30 +03:00
Valery Sizov 1eec680de2 Add documentation for 'Share project with group' API call 2015-09-30 17:47:53 +03:00
Ben Boeckel eb912a534b api: add enable_ssl_verification to PUT/POST hooks 2015-09-24 12:34:16 -04:00
Ben Boeckel b07f48d52e doc: list note_events as a valid parameter for PUT/POST hooks 2015-09-24 12:33:58 -04:00
Ben Boeckel 22db4398c6 api: expose note_events and enable_ssl_verification for hooks 2015-09-24 12:33:11 -04:00
Dmitriy Zaporozhets 1ba393de81 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 2015-09-16 10:26:10 +02:00
Petheo Bence 9bda4b8d88 Added service API endpoint to retrieve service parameters 2015-09-10 18:22:57 +02:00
Artem V. Navrotskiy 1be79e8e7c Move get user by ID of an SSH key documentation to separate file 2015-09-03 16:32:26 +03:00
Artem V. NavrotskiyandArtem V. Navrotskiy 8ec59bd18b Add API method for get user by ID of an SSH key 2015-09-03 15:47:22 +03:00
Kirilll Zaitsev 263abda3fd Drone CI service 2015-09-02 05:52:16 +03:00
Alex Warren 1acad14c9e Correct grant_type in example 2015-08-27 13:55:10 +00:00
Douwe Maan 0f2616b365 Merge branch 'ldap-group-links-api-doc-fix' into 'master' 
Make the `provider` argument for the LDAP group links API endpoint required

Related to #329

If no `provider` is passed to the API endpoint, the group link is not created properly. Making it required fixes the issue temporarily. It should default to the first provider.

Next step, as mentioned in #329, is to do that.

/cc @job

See merge request !475
 2015-08-17 23:24:30 +00:00
Dmitriy Zaporozhets 680b087764 Merge master from CE 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-17 14:01:32 +02:00
Ben Boeckel 95f8f7c729 api: add 'system', 'upvote', and 'downvote' fields to note queries 
This reverts commit 4c586dc7c2.
 2015-08-12 17:02:33 -04:00
Patricio Cano 72412d8478 Made the provider argument a required one, since the feature wasn't working properly if no provider was given. Related to #329 2015-08-11 14:38:13 -05:00
Dmitriy Zaporozhets 0fd7d3ebe0 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-10 16:01:53 +02:00
Douwe Maan 1c7a8b8c27 Fix docs 2015-07-30 11:41:59 +02:00
Douwe Maan 4fb6ddfe06 Add ability to manage user email addresses via the API. 2015-07-29 15:40:08 +02:00
Douwe Maan f032b15dcf Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee 
# Conflicts:
#	README.md
#	app/controllers/projects_controller.rb
#	db/schema.rb
#	doc/workflow/README.md
#	lib/gitlab/satellite/merge_action.rb
 2015-07-23 13:40:31 +02:00
Marin Jankovski 9b6f1c5948 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-16 12:11:25 +02:00
Dmitriy Zaporozhets c84b14d2a1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/autocomplete_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/services_controller.rb
	app/helpers/projects_helper.rb
	app/services/audit_event_service.rb
	db/schema.rb
	doc/api/users.md
	doc/update/6.x-or-7.x-to-7.13.md
	features/project/project.feature
 2015-07-14 15:40:46 +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
Sytse Sijbrandij 31565d7890 Revert "added link to issue closing pattern in doc" 
This reverts commit 903daedb5a.
 2015-07-13 12:36:53 +02:00
karen Carias 903daedb5a added link to issue closing pattern in doc 2015-07-10 12:54:02 -07:00