Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2016-06-02Merge branch 'fix-inline-filter-speed' into 'master'Stan Hu
Fix serious performance bug with rendering Markdown with InlineDiffFilter Nokogiri's `node.replace` was being unnecessarily called for every text node in the document due to a comparison bug. The code previously was comparing the HTML representation of the full document against the text node, which would always fail. Fix the comparison to just compare the modified text. Closes #18011 See merge request !4392
2016-06-02Merge branch 'data_leak' into 'master'Robert Speicher
Confidential notes data leak Fixes part of https://gitlab.com/gitlab-org/gitlab-ee/issues/575 See merge request !1967
2016-06-02Merge branch 'container-registry-token-ttl' into 'master'Douwe Maan
Add Application Setting to configure Container Registry token expire delay (default 5min) This adds an option to configure Container Registry token expire delay. The default is set to 5mins (something that is also used by Docker Hub). What is left: * [x] Write test to check the expire_delay Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/17890 @stanhu I think that this should land in patch release of 8.8. See merge request !4364
2016-06-02Merge branch 'current-settings-use-request-store-during-request'Douwe Maan
2016-06-02Merge branch 'fix-404-labels-in-todos' into 'master' Douwe Maan
Fix 404 page when viewing TODOs that contain milestones or labels in different projects A user viewing the TODOs page will see a 404 if there are mentioned milestones or labels in multiple different projects. This is likely a caching bug and only occurs when Markdown rendering occurs across multiple projects, which is why it's so tricky to reproduce. This is what I think is happening: 1. LabelReferenceFilter#references_in encounters label ~X for ProjectA and finds the label in the DB as id = 1. 2. LabelReferenceFilter.references_in yields [1, 'X', nil, ...] 3. Since project_ref is nil, AbstractReferenceFilter#project_from_ref_cache caches nil => ProjectA. 4. LabelReferenceFilter#references_in encounters label ~Y for ProjectB and finds the label in the DB as id = 2. 5. LabelReferenceFilter.references_in yields [2, 'Y', nil, ...] 6. AbstractReferenceFilter#project_from_ref_cache lookups nil and returns ProjectA. It was supposed to be ProjectB. 7. A is the wrong project, so the label lookup fails. This MR expands the `project_ref` to the right value as soon as we have it to avoid this caching bug. Closes #17898 See merge request !4312
2016-06-02Merge branch 'fix/gitlab-importer-issue' into 'master' Robert Speicher
Fix gitlab importer issue Fixed credentials not being called correctly - probably some bad refactoring or search & replace... Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/565 See merge request !4301
2016-05-25Merge branch 'incremental-fixes' into 'master' Jacob Schatz
Fix concurrent request when updating build log in browser If you have a slow internet connection the trace will not be updated correctly. We need to check if our request is the latest one. Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/17535 See merge request !4183
2016-05-25Merge branch 'zj-gitignore-dropdown'Douwe Maan
2016-05-25Merge branch 'fix-registry-backups' into 'master' Douwe Maan
Fix backups if registry is disabled Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17749 See merge request !4263
2016-05-25Merge branch 'fix-ci-charts-error-500' into 'master' Robert Speicher
Fix Error 500 in CI charts by gracefully handling commits with no durations ## What does this MR do? In the CI charts, this MR reports the duration of a commit to 0 if it is `nil`. ## Are there points in the code the reviewer needs to double check? Should we omit this commit from the chart or set it to some other value? ## Why was this MR needed? We were getting an Error 500 here: https://gitlab.com/gitlab-org/gitlab-ce/graphs/master/ci ## What are the relevant issue numbers? #17730 See merge request !4245
2016-05-25Merge branch 'registry_admin_docs' into 'master' Achilleas Pipinellis
Docker container registry configuration docs. Part of gitlab-org/omnibus-gitlab!764 and gitlab-org/gitlab-ce!4040 See merge request !4141
2016-05-23Merge branch 'fix/migration-helpers-mysql-compatibility' into 'master' Stan Hu
Fix MySQL compatibility in zero downtime migration helpers ## What does this MR do? This MR fixes MySQL for zero downtime migration helpers introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3860 Closes #17711 See merge request !4239
2016-05-21Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'Douwe Maan
# Conflicts: # app/services/system_note_service.rb
2016-05-21Merge branch 'eReGeBe/gitlab-ce-feature/milestone-md' into 'master' Douwe Maan
Implement special GitLab markdown reference for milestones https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3453 by @eReGeBe, with two additions: - Move changelog item to 8.8 - Fix cross-project milestone ref with invalid project, like https://gitlab.com/gitlab-org/gitlab-ce/commit/f7348cd348ad8f4a18d74dd668283a4e236f5790 did for labels Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13829 See merge request !3897
2016-05-20Merge branch 'feature/runner-config-untagged-jobs' into 'master' Robert Speicher
Add config for CI Runner that prevents it from picking untagged jobs Closes #3456 See merge request !4039
2016-05-20Merge branch 'fix-generator-templates-directory' into 'master' Jeroen van Baarsen
Move generator templates to generator_templates/ See merge request !4217
2016-05-20Merge branch '17464-backport-email-syntax-highlighting' into 'master' Douwe Maan
Syntax-highlight diffs in push emails ![image](/uploads/8ecbabc65382214b8de63aae24f66cea/image.png) Based on: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151 See merge request !4147
2016-05-19Add minor corrections related to config of runnerGrzegorz Bizon
2016-05-19Improve setting default runner attrs when using APIGrzegorz Bizon
2016-05-19Set run untagged option when registering a runnerGrzegorz Bizon
2016-05-19Extend runner options that are configurable via APIGrzegorz Bizon
2016-05-19Move generator templates to generator_templates/Yorick Peterse
Since we eager load everything in lib/ putting ERB code in .rb files will result in syntax errors. By moving the templates to ./generator_templates we can work around this.
2016-05-19Removed outdated comment from migration helpersYorick Peterse
2016-05-19Merge branch 'patch-1' into 'master' Rémy Coutable
Fixed advice on invalid permissions on upload path When running the checks, my upload path has wrong permissions, the advice could not fix it because it does not change the permission of this directory (only sub-directories). ``` Uploads directory setup correctly? ... no Try fixing it: sudo find /home/git/gitlab/public/uploads -type d -not -path /home/git/gitlab/public/uploads -exec chmod 0700 {} \; For more information see: doc/install/installation.md in section "GitLab" Please fix the error above and rerun the checks. ``` Executing this instead fixed the error : ``` sudo chmod 700 /home/git/gitlab/public/uploads ``` See merge request !2948
2016-05-19Merge branch 'migration-helpers' into 'master' Robert Speicher
Added helper methods for database migrations These helpers can ultimately be used to write migrations that don't require downtime. See #15464 for more information. See merge request !3860
2016-05-19Fixed typos in migration templatesYorick Peterse
2016-05-19Remove left-over use of strip_heredocYorick Peterse
2016-05-19Fixed advice on invalid permissions on upload pathJazz
2016-05-19Fix warning messages with SVG ALLOWED_ELEMENTSStan Hu
Eliminates "warning: already initialized constant Gitlab::Sanitizers::SVG::ALLOWED_ELEMENTS"
2016-05-19Merge branch 'issue_17560' into 'master' Robert Speicher
Mask credentials from URL when the import of project has failed. REF: #17560 See merge request !4185
2016-05-19Mask credentials from URL when import of project has failed.Rubén Dávila
2016-05-18Merge branch 'docker-registry-view' into 'master' Kamil Trzciński
Add container registry support Tasks: - [x] Merge docker/distribution authentication service: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3787 - [x] Implement Docker Registry API - [x] Show a list of docker images in GitLab - [x] Remove registry repository on project deletion - [x] Support project rename, move and namespace rename - [x] Use token when connecting the registry - [x] Allow to delete images from GitLab - [x] Support pushing from GitLab CI (gitlab-ci-token / $CI_BUILD_TOKEN) - [x] Support GitLab Runner pulling for public repositories - [ ] Support GitLab Runner pulling for private repositories - [x] Add tests for Docker Registry API - [x] Add tests for a views - [x] Make texts nicer - [x] Implement a backup support - [ ] Create administration documentation https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4141 - [ ] Create user documentation See merge request !4040
2016-05-18Merge branch 'fix/import-data-issue' into 'master' Rémy Coutable
Create import data in service and fix timing issues when scheduling job Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17401 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17376 See merge request !4106
2016-05-18Merge branch 'issue_17302' into 'master' Rémy Coutable
Fix api leaking notes when user is not authorized to read noteable fixes #17302 See merge request !4102
2016-05-18Move note helper method to notes entity fileFelipe Artur
2016-05-17Provide full test coverage to lib/container_registry API implementationKamil Trzcinski
2016-05-17Add .gitkeepKamil Trzcinski
2016-05-17fix typo from bad refactoringJames Lopez
2016-05-17Syntax-highlight diffs in push emailsSean McGivern
Based on: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151
2016-05-17Improve test coverageKamil Trzcinski
2016-05-17Added backup of container registryKamil Trzcinski
2016-05-17Merge remote-tracking branch 'origin/master' into docker-registry-viewKamil Trzcinski
2016-05-16Merge branch 'wiki-fix-reloaded' into 'master' Rémy Coutable
Use the relative url prefix for links in Wiki Retry of gitlab-org/gitlab-ce!4026 @rymai !4050 solved all other problems how it looks like. I [tested](https://gitlab.com/artem-forks/gitlab-ce/commit/ff01eca7b559efa7cacf3412aa01cd8ae8a6db7e/builds) this with ruby22 Fixes #17071 See merge request !4131
2016-05-16Fix single note api requestFelipe Artur
2016-05-16Merge branch 'docker-registry' into 'master' Douwe Maan
Added authentication service for docker registry This adds a simple authentication service for docker which uses current user credentials to authenticate pulls and pushes. I have only one concern. Since the `.docker/config` is unencrypted, thus the password for user stored there is unencrypted, maybe we should from the start implement function to generate/provide a separate password just for the purposes of accessing docker registry? What do you think @jacobvosmaer @sytses @marin? cc @marin See merge request !3787
2016-05-16Merge branch 'gh-pull-requests'Douwe Maan
2016-05-16Fix path to tagKamil Trzcinski
2016-05-15Add cache count metrics to rails cachePablo Carranza
2016-05-15Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski
2016-05-15Rename JWT to JSONWebTokenKamil Trzcinski