home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 22:59:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
24,537 Commits 48 Branches 340 Tags
d4e327a592df080588ed8fe616979310000cb288
Commit Graph
3595 Commits
Author SHA1 Message Date
Douwe Maan 3d1de5ba35 Merge branch 'rs-wiki-toc' into 'master' 
Replace Gollum `[[_TOC_]]` tag with result of TableOfContentsFilter

Closes #2494

See merge request !2952
 2016-03-01 16:06:40 +00:00
Douwe Maan c50a20e790 Merge branch 'comment-batch-size' into 'master' 
Batch size >1000 does not pay off

We did a small experiment to see how a full scan of the Redis keys on
gitlab.com speeds up as we increase the batch size. The values on the
right are time in seconds for a full scan (no delete operations).

```
count: 10);      284.500529021
count: 100);      86.21216934
count: 1_000);    60.931676195
count: 10_000);   60.96355610
count: 100_000);  62.378172541
```

It looks like 1,000 is a good number.

See merge request !2970
 2016-03-01 13:52:49 +00:00
Robert Speicher edf5e9eb05 Merge branch 'fix/project-wiki-ending' into 'master' 
Fix for project paths ending in .wiki

This prevents `Git operation was rejected by pre-receive hook` when
an actual project ending with .wiki is thought to be a wiki by the
`Internal` API.

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

See merge request !2960
 2016-02-29 17:50:40 +00:00
Douwe Maan cd391b66e9 Merge branch 'rs-data-links' into 'master' 
Sanitize `data` and `vbscript` links

Closes #13625 

Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2660

See merge request !2905
 2016-02-29 13:22:38 +00:00
James Lopez c401e8338b updated internal.rb and spec based on MR feedback 2016-02-26 10:40:30 +01:00
Jacob Vosmaer a310901280 Batch size >1000 does not pay off 
We did a small experiment to see how a full scan of the Redis keys on
gitlab.com speeds up as we increase the batch size. The values on the
right are time in seconds for a full scan (no delete operations).

count: 10);      284.500529021
count: 100);      86.21216934
count: 1_000);    60.931676195
count: 10_000);   60.96355610
count: 100_000);  62.378172541

It looks like 1,000 is a good number.
 2016-02-25 13:50:08 +01:00
James Lopez d377948931 fix for projects ending in .wiki 2016-02-24 15:54:36 +01:00
Robert Speicher 989946f337 Sanitize vbscript: links 
Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2660
 2016-02-23 20:42:03 -05:00
Robert Speicher bc43ad71ef Replace Gollum [[_TOC_]] tag with result of TableOfContentsFilter 
Closes #2494
 2016-02-23 18:25:40 -05:00
Marin Jankovski f317d5fcb9 Merge branch 'uploads-700' into 'master' 
Restrict permissions on public/uploads

Based on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/631

See merge request !2764
 2016-02-23 15:12:20 +00:00
Robert Speicher 4225fd229f Sanitize data: links 
Closes #13625
 2016-02-21 17:33:35 -05:00
Douwe Maan f81b55bd35 Merge branch 'refactor-scan' into 'master' 
Improve readability of 'rake cache:clear' code



See merge request !2892
 2016-02-20 01:05:00 +00: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
Grzegorz BizonandGrzegorz Bizon df313634d0 Do not allow to modify build if it has been erased 2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon 21152d7d51 Use DELETE verb for erasing a build content 
Also added API specs for that
 2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon 6ca99bd899 And CI API endpoint where user can erase a build 2016-02-19 17:24:59 +01:00
Grzegorz Bizon f6a91ccc5b Move eraseable implementation to build concern 2016-02-19 17:24:03 +01:00
Grzegorz Bizon 9972abc295 Add methods to build eraseable component 2016-02-19 17:24:03 +01:00
Patricio Cano 75ad91822d Merge branch 'saml-decoupling' into 'master' 2016-02-19 10:41:54 -05:00
Jacob Vosmaer 44e4f07037 Improve readability of 'rake cache:clear' code 2016-02-19 14:18:57 +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
Tomasz Maczukin 128be3c010 Add basic runners management API 
- add feature to list runners
- add feature to show runners details
- add feature to delete runner
- add feature to update runner
 2016-02-19 13:18:46 +01:00
Douwe Maan ad12f11f3e Merge branch 'rs-emoji' into 'master' 
Update Gemojione for new hotness ✨

Before | After
------ | -----
![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) | ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png)

See merge request !2800
 2016-02-19 08:11:02 +00:00
Patricio Cano bb4fa3a185 Make new allow_single_sign_on feature backwards compatible 2016-02-18 17:02:43 -05:00
Patricio Cano 06376be56a Decouple SAML authentication from the default Omniauth logic 2016-02-18 17:01:07 -05:00
Douwe Maan 873b0db220 Revert "Merge branch 'saml-decoupling' into 'master' " 
This reverts commit c04e22fba8, reversing
changes made to 0feab326d5.
 2016-02-18 22:14:53 +01:00
Robert Speicher c04e22fba8 Merge branch 'saml-decoupling' into 'master' 
Decouple SAML authentication from the default Omniauth logic

Fixes gitlab-org/gitlab-ee#178

With this merge request SAML gets its own login logic and its own `User` class under `lib/gitlab/saml/` This is needed to give SAML more versatility over how the authorization process works and to pave the way for the development of a SAML group sync as outlined here: gitlab-org/gitlab-ee#118

See merge request !2782
 2016-02-18 19:46:35 +00:00
Jacob Vosmaer 977fdbe830 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into cache-clear 2016-02-18 19:51:58 +01:00