summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '27456-improve-feedback-when-dev-cannot-push-to-empty-repo' ↵Douwe Maan2018-07-181-1/+24
|\ | | | | | | | | | | | | | | | | into 'master' Improve feedback when a developer cannot push in an empty repository Closes #27456 See merge request gitlab-org/gitlab-ce!20519
| * Improves remote message when a developer is unable to push in an empty ↵27456-improve-feedback-when-dev-cannot-push-to-empty-repoTiago Botelho2018-07-181-1/+24
| | | | | | | | repository
* | Remove unreachable Git codeJacob Vosmaer (GitLab)2018-07-183-152/+3
| |
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ↵jivl-dev-master-into-com-masterJose2018-07-171-1/+2
|\ \ | | | | | | | | | jivl-dev-master-into-com-master
| * \ Merge branch 'fix-issue-49133' into 'master'José Iván Vargas López2018-07-171-1/+2
| |\ \ | | | | | | | | | | | | | | | | Fix symlink vulnerability in project import See merge request gitlab/gitlabhq!2440
| | * | Rename WHITELISTED_FILENAMES => IGNORED_FILENAMESStan Hu2018-07-171-2/+2
| | | |
| | * | Fix symlink vulnerability in project importStan Hu2018-07-171-1/+2
| | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/49133
* | | | Merge branch 'extract-ee-specific-banzai-filters' into 'master'Robert Speicher2018-07-173-10/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Extract EE-specific lines from Banzai pipelines See merge request gitlab-org/gitlab-ce!20636
| * | | | Extract EE-specific lines from Banzai pipelinesextract-ee-specific-banzai-filtersSean McGivern2018-07-133-10/+28
| | | | |
* | | | | Merge branch 'satishperala/gitlab-ce-20720_webhooks_full_image_url' into ↵Douwe Maan2018-07-178-39/+131
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Include full image URL in webhooks for uploaded images Closes #20720 See merge request gitlab-org/gitlab-ce!18109
| * | | | Keep #absolute_image_urls as a private instance methodSean McGivern2018-07-171-7/+3
| | | | |
| * | | | Don't include a double slash when rewriting the URLSean McGivern2018-07-061-1/+4
| | | | |
| * | | | Merge branch 'master' into satishperala/gitlab-ce-20720_webhooks_full_image_urlSean McGivern2018-07-0689-1435/+1293
| |\ \ \ \
| * | | | | Add documentation and specs for webhook URL rewritingSean McGivern2018-07-064-32/+50
| | | | | |
| * | | | | Add base class for hook builders, and use it for notes and wikisSean McGivern2018-06-207-31/+93
| | | | | |
| * | | | | Fix MR hook builderSean McGivern2018-06-201-1/+1
| | | | | |
| * | | | | Removing the empty line at the class body beginningSatish Perala2018-06-201-1/+0
| | | | | |
| * | | | | Checking for the presense of markdown textSatish Perala2018-06-201-1/+5
| | | | | |
| * | | | | Passing absolute image urls in the markdown content in the webhooksSatish Perala2018-06-203-0/+10
| | | | | |
* | | | | | Migrate merge base, merged branches, write refJacob Vosmaer (GitLab)2018-07-171-69/+6
| | | | | |
* | | | | | Merge branch 'feature/gb/email-delivery-metrics' into 'master'Sean McGivern2018-07-177-24/+74
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add emails delivery metrics Closes #49214 See merge request gitlab-org/gitlab-ce!20638
| * | | | | Implement action mailer delivery metrics observerGrzegorz Bizon2018-07-161-0/+31
| | | | | |
| * | | | | Move existing email interceptors into the same moduleGrzegorz Bizon2018-07-166-24/+43
| | | | | |
* | | | | | Merge branch 'fix-project-api-archived' into 'master'Rémy Coutable2018-07-162-2/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix archived parameter for projects API Closes #32301 See merge request gitlab-org/gitlab-ce!20566
| * | | | | | Fix archived parameter for projects APIMarko, Peter2018-07-162-2/+8
| | | | | | |
* | | | | | | Merge branch 'tweak-sql-buckets' into 'master'Yorick Peterse2018-07-161-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a 10 ms bucket for SQL timings See merge request gitlab-org/gitlab-ce!20527
| * | | | | | | Add a 10 ms bucket for SQL timingstweak-sql-bucketsYorick Peterse2018-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to calculate quantiles of SQL timings more accurately, instead of a lot of timings being assigned to the 50 ms bucket.
* | | | | | | | Remove Repository#lookup and unreachable rugged codeJacob Vosmaer (GitLab)2018-07-161-179/+0
| | | | | | | |
* | | | | | | | Merge branch ↵Sean McGivern2018-07-164-18/+130
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '48745-project-exports-fail-when-uploads-have-been-migrated-to-object-storage' into 'master' Resolve "Project exports fail when uploads have been migrated to object storage" Closes #48745 See merge request gitlab-org/gitlab-ce!20484
| * | | | | | | refactor code based on feedbackJames Lopez2018-07-162-5/+5
| | | | | | | |
| * | | | | | | use fileuploader dynamic path method in uploads manager and add spec48745-project-exports-fail-when-uploads-have-been-migrated-to-object-storageJames Lopez2018-07-131-6/+1
| | | | | | | |
| * | | | | | | fix typo in uploads managerJames Lopez2018-07-131-1/+1
| | | | | | | |
| * | | | | | | add small comment to download method in uploads managerJames Lopez2018-07-131-0/+1
| | | | | | | |
| * | | | | | | refactor uploads managerJames Lopez2018-07-131-7/+7
| | | | | | | |
| * | | | | | | refactor uploads manager to grab uploads in batchesJames Lopez2018-07-121-6/+16
| | | | | | | |
| * | | | | | | fix uploads restorer missing pathJames Lopez2018-07-121-0/+4
| | | | | | | |
| * | | | | | | fix specJames Lopez2018-07-112-8/+16
| | | | | | | |
| * | | | | | | added changelog, small refactorJames Lopez2018-07-111-2/+1
| | | | | | | |
| * | | | | | | refactor uploads managerJames Lopez2018-07-111-3/+8
| | | | | | | |
| * | | | | | | fix uploads restorerJames Lopez2018-07-111-0/+4
| | | | | | | |
| * | | | | | | fix specsJames Lopez2018-07-113-9/+14
| | | | | | | |
| * | | | | | | add restore methodJames Lopez2018-07-112-3/+18
| | | | | | | |
| * | | | | | | update uploads saverJames Lopez2018-07-102-13/+16
| | | | | | | |
| * | | | | | | Fix avatar saver and specJames Lopez2018-07-101-5/+6
| | | | | | | |
| * | | | | | | add more object storage specsJames Lopez2018-07-101-3/+3
| | | | | | | |
| * | | | | | | add upload manager and specJames Lopez2018-07-101-0/+62
| | | | | | | |
* | | | | | | | Backport logger changes from EEStan Hu2018-07-131-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This resolves the issues identified in https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/81699184.
* | | | | | | | Merge branch 'ide-merge-requests-forks' into 'master'Filipa Lacerda2018-07-131-2/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow merge requests from forks to be opened in Web IDE Closes #47460 See merge request gitlab-org/gitlab-ce!20521
| * | | | | | | | Allow collaboration with forks through the APIBob Van Landuyt2018-07-121-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These APIs are used by the web IDE. They need to be on par with git & web access, allowing edits from maintainers to forks with merge requests that allow access.
* | | | | | | | | Merge branch 'sh-fix-stderr-pipe-consumption' into 'master'Yorick Peterse2018-07-132-7/+20
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid process deadlock in popen by consuming input pipes Closes gitlab-ee#6895 See merge request gitlab-org/gitlab-ce!20600
View Lorry Controller Status