summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bump html-pipeline to 2.8.4sh-bump-html-pipeline-2.8.4Stan Hu2018-07-241-1/+1
| | | | | | | | | In 2.8.3, it was possible to modify a constant without knowing it, which led to a major performance regression (https://gitlab.com/gitlab-org/gitlab-ce/issues/49409). Now attempting to modify the HTML::Pipeline::SanitizationFilter.WHITELIST will result in "can't modify frozen Hash". See https://github.com/jch/html-pipeline/pull/299.
* Merge branch 'mk/add-example-output-for-check-task-docs' into 'master'Stan Hu2018-07-241-0/+39
|\ | | | | | | | | | | | | Add example output for file integrity check rake task Closes #49244 See merge request gitlab-org/gitlab-ce!20825
| * Add example output for file integrity checkMichael Kozono2018-07-241-0/+39
| |
* | Merge branch 'fix-gitlab-registry-ssl-redirect' into 'master'Stan Hu2018-07-241-1/+1
|\ \ | |/ |/| | | | | Fix: redirect non-SSL request for gitlab registry to valid URL See merge request gitlab-org/gitlab-ce!20824
| * Fix: redirect non-SSL request for gitlab registry to valid URLjelhan2018-07-241-1/+1
|/ | | HTTP host and URI should not be separated by a colon. Generated URLs was looking like http://registry.examples.com:/foo. That is throwing up let's encrypt cert requests for gitlab registry.
* Merge branch 'sh-revert-markdown-changes' into 'master'Robert Speicher2018-07-243-1/+18
|\ | | | | | | | | | | | | Fix slow Markdown rendering Closes #49409 See merge request gitlab-org/gitlab-ce!20820
| * Fix slow Markdown renderingStan Hu2018-07-243-1/+18
| | | | | | | | | | | | | | | | | | | | | | The sanitize transformers were being duplicated each time the Markdown renderer was called, leading to expontential growth in rendering times. The problem was that although HTML::Pipeline::SanitizationFilter.WHITELIST is a frozen hash, the `:transformers` array can be modified. We need to do deep copy of this to avoid adding duplicates. Closes #49409
* | Merge branch 'osw-background-migrations-best-practice-doc' into 'master'Yorick Peterse2018-07-241-0/+8
|\ \ | | | | | | | | | | | | Add best practice points regarding background migrations on huge tables See merge request gitlab-org/gitlab-ce!20815
| * | Add points regarding background migrations on huge tablesosw-background-migrations-best-practice-docOswaldo Ferreira2018-07-241-0/+8
| | |
* | | Merge branch 'docs/ha-etc-ssh-typo' into 'master'Marcia Ramos2018-07-241-0/+5
|\ \ \ | | | | | | | | | | | | | | | | Fix typo in high availability docs See merge request gitlab-org/gitlab-ce!20805
| * | | Update gitlab.mddocs/ha-etc-ssh-typoDavin Walker2018-07-241-0/+5
| | | |
* | | | Merge branch 'docs/pat-typo' into 'master'Marcia Ramos2018-07-241-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Remove extra parenthesis in PAT docs See merge request gitlab-org/gitlab-ce!20807
| * | | Remove extra parenthesis in PAT docsdocs/pat-typoAchilleas Pipinellis2018-07-241-1/+1
| | | |
* | | | Merge branch 'backport-gitlab-database' into 'master'Rémy Coutable2018-07-242-0/+112
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Backport various EE changes to Gitlab::Database See merge request gitlab-org/gitlab-ce!20809
| * | | | Backport various EE changes to Gitlab::Databasebackport-gitlab-databaseYorick Peterse2018-07-242-0/+112
| |/ / / | | | | | | | | | | | | | | | | | | | | These changes are useful for CE as well. For example, the MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20720 can make use of some of the backported methods.
* | | | Merge branch 'osw-49554-broken-master' into 'master'Rémy Coutable2018-07-242-2/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Add :sidekiq group to cleanup redis in after callback See merge request gitlab-org/gitlab-ce!20816
| * | | Add :sidekiq group to cleanup redis in after callbackOswaldo Ferreira2018-07-242-2/+2
|/ / /
* | | Merge branch 'dz-refactor-object-store-settings' into 'master'Rémy Coutable2018-07-243-23/+48
|\ \ \ | | | | | | | | | | | | | | | | Create class responsible for default object store settings See merge request gitlab-org/gitlab-ce!20785
| * | | Make ObjectStoreSettings use more explicit and add specsdz-refactor-object-store-settingsDmitriy Zaporozhets2018-07-243-7/+37
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Create class responsible for default object store settingsDmitriy Zaporozhets2018-07-232-24/+19
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'zj-backup-timeout' into 'master'Rémy Coutable2018-07-243-4/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove timeouts for long running requests See merge request gitlab-org/gitlab-ce!20810
| * | | | Remove timeouts for long running requestsZeger-Jan van de Weg2018-07-243-4/+13
| | |/ / | |/| |
* | | | Merge branch 'frozen-string-danger' into 'master'Rémy Coutable2018-07-244-3/+35
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Check Frozen String Literal in Danger See merge request gitlab-org/gitlab-ce!20767
| * | | | Add Dangerfile for frozen_string_literalgfyoung2018-07-244-3/+35
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Checks that new Ruby files will enable frozen string literal. Partially addresses #47424.
* | | | Merge branch 'jxterry-private-profile' into 'master'Douwe Maan2018-07-2422-66/+312
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add an option to have a private profile on GitLab See merge request gitlab-org/gitlab-ce!20387
| * | | | Add an option to have a private profile on GitLabJX Terry2018-07-2422-66/+312
|/ / / /
* | | | Merge branch 'zj-repo-cleanup-mandatory' into 'master'Douwe Maan2018-07-241-4/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make repository cleanup mandatory Closes #49550 See merge request gitlab-org/gitlab-ce!20808
| * | | | Make repository cleanup mandatoryZeger-Jan van de Weg2018-07-241-4/+2
| | |/ / | |/| |
* | | | Merge branch 'update-improve-issue-boards-links-to-docs' into 'master'Achilleas Pipinellis2018-07-241-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update improve issue boards links to docs [ci skip] See merge request gitlab-org/gitlab-ce!20803
| * | | | Update improve issue boards links to docs [ci skip]George Tsiolis2018-07-241-2/+2
| | |/ / | |/| |
* | | | Merge branch '43011-typecast-markdownversion-prop-notesapp' into 'master'Phil Hughes2018-07-242-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix Vue datatype errors for markdownVersion parsing See merge request gitlab-org/gitlab-ce!20800
| * | | | Add changelog entry43011-typecast-markdownversion-prop-notesappKushal Pandya2018-07-241-0/+5
| | | | |
| * | | | Use `parseInt` to convert markdownVersion into numberKushal Pandya2018-07-241-1/+1
| | | | |
* | | | | Merge branch 'kp-stacked-progress-bar-decimal-places' into 'master'Phil Hughes2018-07-246-7/+56
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Show decimal place up to single digit in Stacked Progress Bar Closes gitlab-ee#6028 See merge request gitlab-org/gitlab-ce!20776
| * | | | Add changelog entrykp-stacked-progress-bar-decimal-placesKushal Pandya2018-07-241-0/+5
| | | | |
| * | | | Use `roundOffFloat` method to show decimal places in progressbarKushal Pandya2018-07-243-7/+12
| | | | |
| * | | | Add `roundOffFloat` helper methodKushal Pandya2018-07-242-0/+39
| |/ / /
* | | | Merge branch 'docs-add-read_repository-description' into 'master'Achilleas Pipinellis2018-07-241-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | adds read_repository scope description See merge request gitlab-org/gitlab-ce!20707
| * | | | adds read_repository scope descriptiondocs-add-read_repository-descriptionAlexander Tanayno2018-07-191-0/+1
| | | | |
* | | | | Merge branch 'sh-bump-sanitize-4.6.6' into 'master'Rémy Coutable2018-07-244-5/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Bump nokogiri to 1.8.4 and sanitize to 4.6.6 for performance See merge request gitlab-org/gitlab-ce!20795
| * | | | | Bump nokogiri to 1.8.4 and sanitize to 4.6.6 for performancesh-bump-sanitize-4.6.6Stan Hu2018-07-234-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sanitize 4.6.6 has this optimization that will benefit Markdown rendering: https://github.com/rgrove/sanitize/pull/183 nokogiri 1.4.4 has this memory leak fix: https://github.com/sparklemotion/nokogiri/pull/1771
* | | | | | Merge branch 'frozen-string-enable-app-serializers' into 'master'Rémy Coutable2018-07-24100-8/+216
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Enable frozen string in app/serializers/**/*.rb See merge request gitlab-org/gitlab-ce!20726
| * | | | | Enable frozen string in app/serializers/**/*.rbrepo-forks/gitlab-ce-frozen-string-enable-app-serializersgfyoung2018-07-23100-8/+216
| | | | | | | | | | | | | | | | | | | | | | | | Partially addresses #47424.
* | | | | | Merge branch 'feature/add-docs-to-disable-listener' into 'master'Achilleas Pipinellis2018-07-241-23/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs to disable proxy listener See merge request gitlab-org/gitlab-ce!19734
| * | | | | | Add docs to disable proxy listenermaxmeyer2018-07-241-23/+21
|/ / / / / /
* | | | | | Merge branch 'revert-aeb3df17' into 'master'Achilleas Pipinellis2018-07-241-38/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch '2211-add-option-to-change-clone-path-docs' into 'master'" See merge request gitlab-org/gitlab-ce!20633
| * | | | | | Revert "Merge branch '2211-add-option-to-change-clone-path-docs' into 'master'"revert-aeb3df17Steve Azzopardi2018-07-161-38/+0
| | | | | | | | | | | | | | | | | | | | | This reverts merge request !19664
* | | | | | | Merge branch 'docs-no-milestone-issues-api' into 'master'Sean McGivern2018-07-241-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In docs, add `No+Milestone` for querying by milestone See merge request gitlab-org/gitlab-ce!20784
| * | | | | | | Add `No+Milestone` for querying by milestonedocs-no-milestone-issues-apiVictor Wu2018-07-231-3/+3
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'gitaly-remove-fetch-ref' into 'master'Sean McGivern2018-07-242-0/+5
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | Annotate Gitlab::Git::Repository#fetch_ref See merge request gitlab-org/gitlab-ce!20742
View Lorry Controller Status