summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | Apply pattern to make `find_or_create` atomicGabriel Mazetto2018-07-241-7/+10
| | | | | | | | | | |
| * | | | | | | | | | Use activerecord migration version instead of rescuing for missing tablesGabriel Mazetto2018-07-241-10/+14
| | | | | | | | | | |
| * | | | | | | | | | Added SiteStatistics as counter cache for Projects and WikisGabriel Mazetto2018-07-2411-1/+274
| | | | | | | | | | |
| * | | | | | | | | | CHANGELOGGabriel Mazetto2018-07-241-0/+5
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'issue47716-email_confirmations-squash' into 'master'Douwe Maan2018-07-253-0/+24
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #47716 where email confirmation fails after adding additional emails Closes #47716 See merge request gitlab-org/gitlab-ce!20084
| * | | | | | | | | | | fixes #47716 where email confirmation fails after adding additional emailsMuhammad Nuzaihan2018-07-253-0/+24
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'sh-include-rbtrace' into 'master'Douwe Maan2018-07-256-0/+34
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add rbtrace to Gemfile See merge request gitlab-org/gitlab-ce!20831
| * | | | | | | | | | Add rbtrace to Gemfilesh-include-rbtraceStan Hu2018-07-256-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be enabled if ENABLE_RBTRACE environment variable is defined. This will allow us to debug all sorts of issues in production: https://github.com/tmm1/rbtrace
* | | | | | | | | | | Merge branch '49582-enable-cops-for-db' into 'master'Rémy Coutable2018-07-25167-157/+55
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable rubocop for db/**/* and ee/db/**/* Closes #49582 See merge request gitlab-org/gitlab-ce!20834
| * | | | | | | | | | | Enable rubocop for db/**/* and ee/db/**/*49582-enable-cops-for-dbLin Jen-Shin2018-07-25167-157/+55
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'backport-reactive-caching' into 'master'Rémy Coutable2018-07-252-2/+15
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Back port ReactiveCaching See merge request gitlab-org/gitlab-ce!20836
| * | | | | | | | | | Backport reactive cachingShinya Maeda2018-07-252-2/+15
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '49025-docs-kubernetes-tiller' into 'master'Marcia Ramos2018-07-252-7/+16
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc: Configuring and initializing Helm Tiller Closes #49025 See merge request gitlab-org/gitlab-ce!20515
| * | | | | | | | | | Update docs of Helm TillerTakuya Noguchi2018-07-132-7/+16
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'docs/styleguide-versions' into 'master'Marcia Ramos2018-07-251-8/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prefer using direct links in docs styleguide See merge request gitlab-org/gitlab-ce!20832
| * | | | | | | | | | | Prefer using direct links in docs styleguidedocs/styleguide-versionsAchilleas Pipinellis2018-07-251-8/+6
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'update-rack-attack-deprecation-note-in-docs' into 'master'Douwe Maan2018-07-251-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds rack attack disabled by default notice to documentation See merge request gitlab-org/gitlab-ce!20833
| * | | | | | | | | | | | Adds rack attack disabled by default notice to documentationupdate-rack-attack-deprecation-note-in-docsTiago Botelho2018-07-251-0/+4
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch '40973-disable-rack-attack-by-default' into 'master'Douwe Maan2018-07-254-4/+17
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable Rack Attack by default Closes #40973 See merge request gitlab-org/gitlab-ce!16669
| * | | | | | | | | | | | Adds changelogTiago Botelho2018-07-251-0/+5
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix Rack Attack documentation to reflect the feature being disabled by defaultTiago Botelho2018-07-251-3/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | Disables Rack Attack by defaultTiago Botelho2018-07-252-1/+9
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'frozen-string-enable-app-presenters' into 'master'Rémy Coutable2018-07-2549-0/+101
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable frozen string in presenters and policies See merge request gitlab-org/gitlab-ce!20819
| * | | | | | | | | | | | Enable frozen string in presenters and policiesrepo-forks/gitlab-ce-frozen-string-enable-app-presentersgfyoung2018-07-2449-0/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable frozen string in: * app/presenters * app/policies Partially addresses #47424.
* | | | | | | | | | | | | Merge branch 'i18n-extract-app/views/layouts' into 'master'Rémy Coutable2018-07-2529-232/+371
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n: externalize strings from 'app/views/layouts' See merge request gitlab-org/gitlab-ce!19766
| * | | | | | | | | | | | i18n: externalize strings from 'app/views/layouts'Tao Wang2018-07-2329-232/+371
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tao Wang <twang2218@gmail.com>
* | | | | | | | | | | | | Merge branch 'sh-bump-html-pipeline-2.8.4' into 'master'Rémy Coutable2018-07-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump html-pipeline to 2.8.4 See merge request gitlab-org/gitlab-ce!20828
| * | | | | | | | | | | | 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 'replace-all-snake-case-in-scss-variables' into 'master'Phil Hughes2018-07-2523-164/+163
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace snake case in SCSS variables See merge request gitlab-org/gitlab-ce!20799
| * | | | | | | | | | | | Replace snake case in mixins and merge_conflicts variablesGeorge Tsiolis2018-07-253-110/+109
| | | | | | | | | | | | |
| * | | | | | | | | | | | Replace snake case in SCSS variablesGeorge Tsiolis2018-07-2520-54/+54
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'sh-use-wiki-limit-parameter-gitaly' into 'master'Sean McGivern2018-07-2511-14/+105
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use limit parameter to retrieve Wikis from Gitaly See merge request gitlab-org/gitlab-ce!20764
| * | | | | | | | | | | | | Use limit parameter to retrieve Wikis from Gitalysh-use-wiki-limit-parameter-gitalyStan Hu2018-07-2411-14/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this parameter, every load of a Wiki page will load all the Wiki pages in the repository for the sidebar. This is a significant performance penalty that can significant slow the display of all Wiki pages. Relates to #40101
* | | | | | | | | | | | | | Merge branch 'docs-fix-users-md-typo' into 'master'Achilleas Pipinellis2018-07-251-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing ` in users.md See merge request gitlab-org/gitlab-ce!20817
| * | | | | | | | | | | | | | Fix missing ` in users.mdfix-users-md-typodocs-fix-users-md-typoLin Jen-Shin2018-07-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is already applied in EE
* | | | | | | | | | | | | | | Merge branch 'replace-snake-case-css-classes' into 'master'Phil Hughes2018-07-2519-33/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace author_link snake case in stylesheets, specs, and helpers Closes #30921 See merge request gitlab-org/gitlab-ce!20797
| * | | | | | | | | | | | | | Replace author_link snake case in stylesheets, specs, and helpersGeorge Tsiolis2018-07-247-9/+14
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Replace author_link snake case in specsGeorge Tsiolis2018-07-246-13/+13
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Replace author_link snake case in vue componentsGeorge Tsiolis2018-07-244-4/+4
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Replace author_link snake case in stylesheetsGeorge Tsiolis2018-07-246-7/+5
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'sh-add-frozen-literal-templates' into 'master'Rémy Coutable2018-07-253-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add frozen_string_literal to migration templates See merge request gitlab-org/gitlab-ce!20829
| * | | | | | | | | | | | | | | Add frozen_string_literal to migration templatessh-add-frozen-literal-templatesStan Hu2018-07-243-0/+6
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of #47424
* | | | | | | | | | | | | | | Merge branch 'using-docker-build-docs' into 'master'Achilleas Pipinellis2018-07-251-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update doc/ci/docker/using_docker_build.md Closes #48691 See merge request gitlab-org/gitlab-ce!20426
| * | | | | | | | | | | | | | Update doc/ci/docker/using_docker_build.mdTobias Hernstig2018-07-251-4/+6
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | 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