home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 05:06:46 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,876 Commits 48 Branches 340 Tags
eea8a6d0620e47fb4c009eefb73fa100fa2ba3e8
Commit Graph
623 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 353ddbc795 Merge branch 'stanhu/gitlab-ce-fix-api-mr-comment-notifications' 2015-10-15 15:56:43 +02:00
Douwe Maan c993481d99 Merge branch 'master' into git-archive-golang 2015-10-15 11:47:36 +02:00
Valery Sizov 4117d9b310 Merge branch 'feature/api_hide_service_password' of gitlab.com:cernvcs/gitlab-ce 2015-10-14 14:15:34 +03:00
sue445 a092d27025 [ci skip] Fix wrong comment 
According to `attributes_for_keys` and API doc, `POST /projects/:id/merge_requests`
is received `target_project_id` (NOT `target_project`)
 2015-10-14 00:36:54 +09:00
Kamil Trzcinski daca1c6511 Fix broken tests 2015-10-12 22:32:29 +02:00
Kamil Trzcinski c61dc13150 Fix some changes 2015-10-12 16:41:36 +02:00
Kamil Trzcinski 789fe7b489 Update rendering 2015-10-12 16:32:58 +02:00
Kamil Trzcinski 69c04498ef Small bug fixes 2015-10-12 15:55:12 +02:00
Alex Lossent 024e34e94d Hide passwords to non-admin users in the services API 
In order to be consistent with !1490 doing it for the web interface
 2015-10-12 15:24:00 +02:00
Kamil Trzcinski 0aefeeb882 Add Commit Status documentation 2015-10-12 12:42:27 +02:00
Kamil Trzcinski 7ef156a242 Add author to statuses 2015-10-12 12:16:55 +02:00
Kamil Trzcinski 887494761e Fix commit status POST URL 2015-10-12 12:15:35 +02:00
Kamil Trzcinski 914cfbd2f1 Implement Commit Status API 2015-10-12 11:53:49 +02:00
Stan Hu 2df573dac3 Fix bug where merge request comments created by API would not trigger notifications 
Closes https://github.com/gitlabhq/gitlabhq/issues/9715
 2015-10-10 10:59:02 -07:00
Jacob Vosmaer cb13980db8 Let gitlab-git-http-server handle archive downloads 
This change relies on changes in gitlab_git and gitlab-git-http-server.
 2015-10-08 17:12:00 +02:00
Guilherme Garnier 59d0263bc8 Fix rubocop warnings in lib 2015-10-03 01:29:58 -05:00
Ben Boeckel eb912a534b api: add enable_ssl_verification to PUT/POST hooks 2015-09-24 12:34:16 -04:00
Ben Boeckel 22db4398c6 api: expose note_events and enable_ssl_verification for hooks 2015-09-24 12:33:11 -04:00
Patricio Cano f60eb60473 Added ability to update or set the identity of an existing user, like the documentation said it was possible, but actually wasn't. 2015-09-22 16:26:59 -05:00
Dmitriy Zaporozhets da3d35952d Merge branch 'restrict-user-api-integers' into 'master' 
Restrict users API endpoints to use integer IDs

Closes #2267

See merge request !1156
 2015-09-17 07:29:57 +00:00
Kamil Trzcinski ac8d2eb065 Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-16 13:34:58 +02:00
Stan Hu 1c289ac0c3 Fix broken sort in merge request API 
Closes #2266
 2015-09-15 22:55:22 -07:00
Valery Sizov 22bf844869 fix specs. Stage 3 2015-09-15 13:50:24 +03:00
Valery Sizov 910bf96ec3 fix specs. Stage 2 2015-09-14 18:14:17 +03:00
Dmitriy Zaporozhets e3c30bf2e8 Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-11 16:32:11 +02:00
Dmitriy Zaporozhets 2ed2ef9210 Remove network from CI 2015-09-11 13:38:37 +02:00
Petheo Bence 9bda4b8d88 Added service API endpoint to retrieve service parameters 2015-09-10 18:22:57 +02:00
Dmitriy Zaporozhets 0b5d627cd4 Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-09 14:56:02 +02: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
Douwe Maan 046b283127 Groundwork for merging CI into CE 2015-08-25 18:42:46 -07:00
Stan Hu d241c6d057 Restrict users API endpoints to use integer IDs 
Closes #2267
 2015-08-23 06:13:16 -07:00
Dmitriy Zaporozhets 72a425fa66 Merge branch 'remove-satellites' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-19 09:52:39 +02:00
Stan Hu e56fd693ee Merge pull request #9567 from bigsurge/bigsurge-patch-1 
add CommitNote field expose :created_at
 2015-08-19 00:23:17 -07:00
bigsurge cecc18616a add CommitNote field expose :created_at 
add CommitNote field expose :created_at
 2015-08-19 14:29:18 +08:00
Dmitriy Zaporozhets 4a0fa27017 Merge branch 'master' into remove-satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-17 11:41:53 +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
Dmitriy Zaporozhets 3e259ea8bc Revert "Merge branch 'revert-satellites' into 'master' " 
This reverts commit 5daf44b7c8, reversing
changes made to 2f706fbd23.
 2015-08-11 14:33:31 +02:00
Dmitriy Zaporozhets 5daf44b7c8 Merge branch 'revert-satellites' into 'master' 
Revert satellites

Return satellites to master for 7.14

We remove satellites in next release (8.0)

See merge request !1136
 2015-08-11 12:27:38 +00:00
Dmitriy Zaporozhets b9b9fe70b8 Revert "Fix editing files via API" 
This reverts commit 7bde6ae540.
 2015-08-11 13:29:35 +02:00
Dmitriy Zaporozhets 9f10943c1a Revert "Merge branch 'drop-satellites'" 
This reverts commit 957e849f41, reversing
changes made to 6b9dbe9f5a.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 10:28:42 +02:00
Stan Hu c5648de230 Fix corrupted binary files when using API files endpoint 
Add CHANGELOG for gitlab_git 7.2.9 updates

Closes #2219
 2015-08-09 15:23:22 -07:00
Douwe Maan 8b6ae0104d Merge branch 'master' into comment-updated-by 2015-08-06 12:52:26 +02:00
Dmitriy Zaporozhets b48b07044b Merge branch 'master' into drop-satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-04 16:42:36 +02:00
Dmitriy Zaporozhets c17f5d06aa Fix merge api and spec 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-04 16:33:53 +02:00
Douwe MaanandRobert Speicher 8802846565 Fix indentation 2015-07-31 16:39:51 -04:00
Douwe Maan 51e5f379dd Merge branch 'master' into api-useremails 2015-07-31 14:34:53 +02:00
Douwe Maan 04f2da3c37 Merge branch 'master' into comment-updated-by 2015-07-31 14:29:23 +02:00
Douwe Maan 36bd6c8494 Show who last edited a comment if it wasn't the original author 2015-07-30 14:45:54 +02:00
Douwe Maan b8066e2cd0 No more web url 2015-07-30 11:56:15 +02:00