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
25,500 Commits 48 Branches 340 Tags
8-6-stable
Commit Graph
830 Commits
Author SHA1 Message Date
Rémy CoutableandRémy Coutable a818f0fc96 Merge branch 'fix-project-hook-delete-permissions' into 'master' 
Prevent users from deleting Webhooks via API they do not own

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15576

See merge request !1959

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-26 10:12:56 +02:00
Robert SpeicherandRobert Speicher 4760892478 Merge branch '15579-filter-milestone-confidential-issues-api' into 'master' 
Prevent information disclosure via milestone API

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15579

See merge request !1961
 2016-04-25 20:39:42 -04:00
Robert SpeicherandRobert Speicher 5e3f9b6076 Merge branch 'fix-private-snippet-api' into 'master' 
Prevent information disclosure via snippet API

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15580

See merge request !1958
 2016-04-25 16:35:32 -04:00
Douwe MaanandRémy Coutable d0a7dfd66d Merge branch '2489-soft-delete-issues' into 'master' 
Soft delete issuables

Fixes #2489 

What still needs to happen: research on the indexes, the gem suggests a [lot of changes](https://github.com/rubysherpas/paranoia#about-indexes) though this is probably a good idea to discuss and I'm unsure on the impact of an omnibus upgrade as I suspect creating about 10 new indexes has a large impact on the downtime.

TODO: 
- [x] Also group owners can ***soft*** delete
- [x] Button should be hidden

See merge request !2982
 2016-03-22 12:36:02 +01:00
Robert SpeicherandRobert Speicher c8cc1c16d1 Merge branch 'issue_12658' into 'master' 
Add group visibility level

Supersedes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3051

Closes #12658

See merge request !3323
 2016-03-21 21:37:57 -04:00
Douwe MaanandRémy Coutable cf52a9b435 Merge branch 'confidential-issues' into 'master' 
Add confidential issues

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/3678

More information: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/227

See merge request !3282
 2016-03-18 21:03:39 +01:00
Achilleas Pipinellis 956e914307 Add missing API docs on external user 
[ci skip]
 2016-03-17 12:21:12 +02:00
Zeger-Jan van de Weg 51300d9b2a API support for setting External flag on existing users 2016-03-17 09:36:00 +01:00
Zeger-Jan van de Weg 59064aeeef Merge branch 'master' into 4009-external-users 2016-03-15 19:16:16 +01:00
Zeger-Jan van de Weg aaf4434b0e Doc external users feature 2016-03-15 18:50:58 +01:00
Robert Speicher c4b35a6230 Merge branch 'fix-commit-status-rendering' into 'master' 
Cleanup Ci::Commit, Ci::Build and CommitStatus views

This MR tries to do first sweep of cleanups to Ci::Commit and
Ci::Build objects removing all view-related functions and fixing the
API from other side.

Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/6046

See merge request !2760
 2016-03-15 00:51:43 +00:00
Zeger-Jan van de Weg 88f8d3a4d6 Merge branch 'master' into 4009-external-users 2016-03-14 20:08:02 +01:00
Dmitriy Zaporozhets d324bf8434 Merge branch 'share-project-ce' into 'master' 
Bring from EE: Share Project with Group

- [x] Models and migrations
- [x] Logic, UI
- [x] Tests
- [x] Documentation
- [x] Share with group lock
- [x] Api feature
- [x] Api docs
- [x] Api tests

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

For #12831 

cc @DouweM @rspeicher @vsizov

See merge request !3186
 2016-03-14 16:38:52 +00:00
Kamil Trzcinski 0672258915 Cleanup CiCommit and CiBuild 
- Remove all view related methods from Ci::Build and CommitStatus
- Remove unused Ci::Commit and Ci::Build methods
- Use polymorphism to render different types of CommitStatus
 2016-03-14 13:20:35 +01:00
Zeger-Jan van de Weg 42fcd3881f External Users 
The user has the rights of a public user execpt it can never create a project,
 group, or team. Also it cant view internal projects.
 2016-03-13 19:08:04 +01:00
Dmitriy Zaporozhets e8b3b92dde Bring share project with group API from EE 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-13 11:52:43 +01:00
Robert Speicher befa7a9c17 Don't remove ProjectSnippet#expires_at from API 
See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3103

This partially reverts commit 836d593033.
 2016-03-09 16:56:42 -05:00
Dmitriy Zaporozhets bc14d81af0 Merge branch 'rs-snippets-dont-expire' into 'master' 
Remove `Snippet#expires_at`

This was removed from the interface in
https://github.com/gitlabhq/gitlabhq/pull/6027 but its implementation
lingered around for two years.

See merge request !3103
 2016-03-09 09:02:17 +00:00
Robert Speicher 836d593033 Remove Snippet#expires_at 
This was removed from the interface in
https://github.com/gitlabhq/gitlabhq/pull/6027 but its implementation
lingered around for two years.
 2016-03-05 18:12:17 -05:00
evuezandRémy Coutable b0d24ab1b5 Add fields to GET /users/* API endpoints for admins 
Added fields are last_sign_in_at and confirmed_at.
They are available for GET /users/ and GET /users/:id for admins.

Closes #840
 2016-03-04 11:59:43 +01:00
Jacob Vosmaer 1764e1b7cb Use Gitlab::Git::DiffCollections 2016-03-03 18:38:44 +01:00
Douwe Maan 9b3c1a8c4f Merge branch 'fix/commit-status-api-improvement' into 'master' 
Return empty array when commit has no statuses in API

This makes API endpoint for Commit Statuses return empty array instead
of 404 when commit exists, but has no statuses.

Closes #3080

See merge request !3010
 2016-03-01 16:50:23 +00:00
Grzegorz Bizon 85a461e096 Check if commit exists first in commit status API 2016-03-01 11:11:50 +01:00
Grzegorz Bizon dcc67ac1fd Return empty array when commit has no statuses in API 
This makes API endpoint for Commit Statuses return empty array instead
of 404 when commit exists, but has no statuses.

Closes #3080
 2016-02-29 13:54:33 +01:00
James Lopez c401e8338b updated internal.rb and spec based on MR feedback 2016-02-26 10:40:30 +01:00
James Lopez d377948931 fix for projects ending in .wiki 2016-02-24 15:54:36 +01:00
Kamil Trzcinski 46fd485c58 Fix API implementation 2016-02-19 18:30:43 +01:00
Kamil Trzcinski 921cfb66e6 Introduce API for serving the artifacts archive 2016-02-19 18:30:13 +01:00
Grzegorz Bizon 73c9d80bdc Record user that erased a build through API 2016-02-19 17:24:59 +01:00
Grzegorz Bizon 7d5a182624 Use POST method instead of DELETE when erasing a build 
Discussion:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2560#note_3742042
 2016-02-19 17:24:59 +01:00
Grzegorz Bizon 287cc838ce Fix build api specs after rebase 2016-02-19 17:24:59 +01:00
Grzegorz Bizon 293999cabb Fix name of build erasable, remove superfluous method from it 2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon 13f92521c2 Move build eraseable API to proper API context 2016-02-19 17:24:59 +01:00
Tomasz Maczukin f2f6f77328 Rename Entities::ForkedFromProject to Entities::BasicProjectDetails 2016-02-19 13:18:49 +01:00
Tomasz Maczukin e4d2f9972c Change last_contact to contacted_at 2016-02-19 13:18:49 +01:00
Tomasz Maczukin 7ea60c8564 Replace Entities::RunnerProjectDetails with Entities::ForkedFromProject 2016-02-19 13:18:49 +01:00
Tomasz Maczukin 4ebadb77dd iChange name and path to name_with_namespace and path_with_namespace in RunnerProjectDetails 2016-02-19 13:18:48 +01:00
Tomasz Maczukin b36116f9ad Move :runner_id param to POST body when enabling specific runner in project 2016-02-19 13:18:48 +01:00
Tomasz Maczukin d1ac00aea3 Modify and fix output of delete and update of a runner 2016-02-19 13:18:48 +01:00
Tomasz Maczukin 24eed1c5c1 Modify runner projects selecting method in runners API 2016-02-19 13:18:48 +01:00
Tomasz Maczukin 36e7ffea5d Fix runners filtering 2016-02-19 13:18:47 +01:00
Tomasz Maczukin f21b15d5f5 Limit projects to user available projects if user is not an admin 2016-02-19 13:18:47 +01:00
Tomasz Maczukin b58744cd93 Modify authentication check methods in runners API 2016-02-19 13:18:47 +01:00
Tomasz Maczukin 553bac57d0 Add token to runner details output in API 2016-02-19 13:18:47 +01:00
Tomasz Maczukin f562a477f2 Add associated project info to runner details output 2016-02-19 13:18:47 +01:00
Tomasz Maczukin 81ced6f55b Split /runners entrypoint to /runners and /runners/all 2016-02-19 13:18:47 +01:00
Tomasz Maczukin b56ee397bb Add some fixes in runners API documentation 2016-02-19 13:18:46 +01:00
Tomasz Maczukin 53f775ae6d Fix runners filtering in API 2016-02-19 13:18:46 +01:00
Tomasz Maczukin 8c37f0ff30 Add missing methods documentation; fix rubocop reported violation 2016-02-19 13:18:46 +01:00
Tomasz Maczukin d42ced44d9 Add feature to enable/disable runner in project 2016-02-19 13:18:46 +01:00