summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Centralize config for markdownlintcentralize-markdownlint-configMarkus Koller2019-07-086-3/+28
| | | | | | | | The configuration is currently only specified in CI, by moving it into `.mdlrc` we get immediate feedback locally in supported editors. To ensure `mdl` is available it's also added to the `Gemfile`, though CI will still use the version installed in the `gitlab-docs-lint` image.
* Fix Markdown errorsMarkus Koller2019-07-083-8/+8
|
* Merge branch 'docs/enforce-headers-increment-one-level' into 'master'Achilleas Pipinellis2019-07-0813-50/+50
|\ | | | | | | | | Add lint rule that headings must increment one level at a time See merge request gitlab-org/gitlab-ce!30376
| * Add lint rule that headings must increment one level at a timeEvan Read2019-07-0813-50/+50
|/ | | | Also fixes instances in Markdown that broke the rule.
* Merge branch '12632-fix-multiple-discussions' into 'master'Phil Hughes2019-07-085-0/+23
|\ | | | | | | | | Starting a new discussion only on line without Draft note created on it See merge request gitlab-org/gitlab-ce!30413
| * Backported EE fix to CENatalia Tepluhina2019-07-085-0/+23
|/ | | | | | | - fixed attribute to be not hyphenated - applied parallel diffs view on CE - separated left and right drafts - added fallback for hasDrafts
* Merge branch '40379-CJK-search-min-chars' into 'master'Andreas Brandl2019-07-086-13/+44
|\ | | | | | | | | Remove minimum required characters for fuzzy search if no trigram is used See merge request gitlab-org/gitlab-ce!29810
| * Ignore min_chars_for_partial_matching unles trigrm40379-CJK-search-min-charsMario de la Ossa2019-07-046-13/+44
| | | | | | | | | | If we're not using a trigram index, then ignore the min_chars_for_partial_matching setting
* | Merge branch 'docs-brackets-to-parens' into 'master'Achilleas Pipinellis2019-07-08216-647/+647
|\ \ | | | | | | | | | | | | Docs: Changing badges to use parentheses not brackets See merge request gitlab-org/gitlab-ce!30439
| * | Changing badges to use parentheses not bracketsMarcel Amirault2019-07-08216-647/+647
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we used brackets to denote the tier badges, but this made Kramdown, the docs site Markdown renderer, show many warnings when building the site. This is now fixed by using parentheses instead of square brackets. This was caused by [PREMIUM] looking like a link to Kramdown, which couldn't find a URL there. See: - https://gitlab.com/gitlab-com/gitlab-docs/merge_requests/484 - https://gitlab.com/gitlab-org/gitlab-ce/issues/63800
* | Merge branch '60213-fix-is-ee-webpack-checks' into 'master'Filipa Lacerda2019-07-0813-41/+25
|\ \ | | | | | | | | | | | | | | | | | | Replace runtime isEE check with compile time one Closes #60213 See merge request gitlab-org/gitlab-ce!30351
| * | Replace runtime isEE check with compile time one60213-fix-is-ee-webpack-checksLukas Eipert2019-07-0513-41/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | This has the benefit that CE bundles will remove dead code in CE only builds. We have a follow-up issue to get rid of this completely: https://gitlab.com/gitlab-org/gitlab-ce/issues/64173
* | | Merge branch 'vue-i18n-js-vue-shared-directory' into 'master'Phil Hughes2019-07-0821-56/+138
|\ \ \ | | | | | | | | | | | | | | | | Vue-i18n: autofix for app/assets/javascripts/vue_shared directory See merge request gitlab-org/gitlab-ce!30287
| * | | Vue-i18n: app/assets/javascripts/vue_shared directoryEzekiel Kigbo2019-07-0821-56/+138
|/ / / | | | | | | | | | | | | i18n linting for .vue files under the app/assets/javascripts/vue_shared directory
* | | Merge branch 'vue-i18n-js-vue-mr-widget-directory' into 'master'Fatih Acet2019-07-089-46/+117
|\ \ \ | | | | | | | | | | | | | | | | Vue-i18n: autofix for app/assets/javascripts/vue_merge_request_widget directory See merge request gitlab-org/gitlab-ce!30035
| * | | Vue-i18n: app/assets/javascripts/vue_merge_request_widget directoryEzekiel Kigbo2019-07-089-46/+117
|/ / / | | | | | | | | | | | | i18n linting for .vue files under the app/assets/javascripts/vue_merge_request_widget directory
* | | Merge branch 'renovate/gitlab-svgs-1.x' into 'master'Fatih Acet2019-07-082-5/+5
|\ \ \ | | | | | | | | | | | | | | | | Update dependency @gitlab/svgs to ^1.67.0 See merge request gitlab-org/gitlab-ce!30402
| * | | Update dependency @gitlab/svgs to ^1.67.0Lukas Eipert2019-07-052-5/+5
| | | |
* | | | Merge branch '12533-shared-runners-warning' into 'master'Phil Hughes2019-07-082-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for app/views/admin/users/show.html.haml Closes gitlab-ee#12533 See merge request gitlab-org/gitlab-ce!30407
| * | | | Removes EE differences12533-shared-runners-warningFilipa Lacerda2019-07-052-1/+6
| | | | |
* | | | | Merge branch '60856-deleting-binary-file' into 'master'winh-does-jest-failKushal Pandya2019-07-088-17/+88
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Removing an image via Web IDE shows binary data" Closes #60856 See merge request gitlab-org/gitlab-ce!30314
| * | | | | Initiate editor for any file without content60856-deleting-binary-fileDenys Mishunov2019-07-055-14/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Important to get file data for any file that has no content set yet: we need this information in order to build a previe for changed/staged files if they were not yet opened in the editor
| * | | | | Mark images as binary on initDenys Mishunov2019-07-053-3/+7
| | |_|/ / | |/| | |
* | | | | Merge branch 'clusters-group-cte' into 'master'James Lopez2019-07-085-3/+216
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Clusters hierarchy CTE See merge request gitlab-org/gitlab-ce!30063
| * | | | | Create CTE query for clusters hierarchyThong Kuah2019-07-085-3/+216
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This enables us to use a scope to query all clusters in group hierarchy order in one query, and also enables us to union to instance clusters later. - Handle case where clusters not present at level. In which case the query should go ahead and return the next level's clusters. - Swap with new CTE query behind Feature flag. This FF is default disabled.
* | | | | Merge branch 'patch-71' into 'master'Evan Read2019-07-081-3/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Description of the optimized path wildcard See merge request gitlab-org/gitlab-ce!30082
| * | | | | Description of the optimized path wildcardBlack-Hole2019-07-081-3/+5
|/ / / / /
* | | | | Merge branch 'docs-update-jira-integration' into 'master'Evan Read2019-07-089-20/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs: Update Jira integration See merge request gitlab-org/gitlab-ce!29997
| * | | | | Refresh screenshotsTristan Williams2019-07-089-20/+22
|/ / / / / | | | | | | | | | | | | | | | Current screenshots are from an older version of Jira and GitLab.
* | | | | Merge branch 'patch-71' into 'master'Evan Read2019-07-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ADD '.git' ending to git clone with CI_JOB_TOKEN for clarity See merge request gitlab-org/gitlab-ce!30200
| * | | | | ADD '.git' ending to git clone with CI_JOB_TOKEN for clarityglass-ships2019-07-081-1/+1
|/ / / / /
* | | | | Merge branch 'docs-redirected-links-1' into 'master'20190708_Jenkins_Docspage_Update_DMP_AOEvan Read2019-07-0822-32/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Update redirected links in docs (part 1) Closes #64225 See merge request gitlab-org/gitlab-ce!30379
| * | | | | Update redirected links in CE part 1Marcel Amirault2019-07-0822-32/+31
|/ / / / / | | | | | | | | | | | | | | | | | | | | First MR in a series updating all redirected links in CE documentation to the destination URLs
* | | | | Merge branch 'qa/refactor-plan-issues-check-mentions-for-xss-spec' into 'master'Mark Lapierre2019-07-081-3/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Refactor end-to-end test See merge request gitlab-org/gitlab-ce!30421
| * | | | | Refactor end-to-end testqa/refactor-plan-issues-check-mentions-for-xss-specWalmyr Lima2019-07-051-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - to be explicit when fabricating resources via API or browser UI - and to improve test speed by fabricating some resources via API instead of via the GUI.
* | | | | | Merge branch ↵Evan Read2019-07-081-1/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'da-add-note-that-internal-url-work-with-load-balancer-that-terminates-tls-docs' into 'master' Geo - Add note that Internal URL works only with a Load Balancer with TLS termination See merge request gitlab-org/gitlab-ce!30372
| * | | | | | Add note that internal URL works only with a LB with TLS terminationda-add-note-that-internal-url-work-with-load-balancer-that-terminates-tls-docsDouglas Barbosa Alexandre2019-07-051-1/+7
| | | | | | |
* | | | | | | Merge branch 'exclude-documentation-from-danger' into 'master'Nick Thomas2019-07-061-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dangerfile to exclude docs ci yaml See merge request gitlab-org/gitlab-ce!30335
| * | | | | | | Update dangerfile to exclude docs ci yamlMarcel Amirault2019-07-061-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'sh-disable-reactive-caching-automatic-retries' into 'master'Nick Thomas2019-07-063-3/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent amplification of ReactiveCachingWorker jobs upon failures Closes #64176 See merge request gitlab-org/gitlab-ce!30432
| * | | | | | | Prevent amplification of ReactiveCachingWorker jobs upon failuressh-disable-reactive-caching-automatic-retriesStan Hu2019-07-063-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `ReactiveCachingWorker` hits an SSL or other exception that occurs quickly and reliably, automatically rescheduling a new worker could lead to excessive number of jobs being scheduled. This happens because not only does the failed job get rescheduled in a minute, but each Sidekiq retry will also add even more rescheduled jobs. In busy instances, this can become an issue because large numbers of `ReactiveCachingWorker` running can cause high rates of `ExclusiveLease` reads to occur and possibly saturate the Redis server with queries. We now disable this automatic retry and rely on Sidekiq to perform its 3 retries with a backoff period. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64176
* | | | | | | | Merge branch 'sh-upgrade-rouge-3.5.1' into 'master'Grzegorz Bizon2019-07-063-3/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Rouge to 3.5.1 See merge request gitlab-org/gitlab-ce!30431
| * | | | | | | | Upgrade Rouge to 3.5.1sh-upgrade-rouge-3.5.1Stan Hu2019-07-063-3/+8
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This release includes continued improvements to the library, fixes for a number of lexers and support for three new languages: https://github.com/rouge-ruby/rouge/releases
* | | | | | | | Merge branch 'revert-01c917e3' into 'master'Thong Kuah2019-07-061-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Revert "Increase rspec parallelism" See merge request gitlab-org/gitlab-ce!30429
| * | | | | | | Revert "Merge branch '63825-increase-rspec-parallelism' into 'master'"revert-01c917e3Nick Thomas2019-07-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !30130
* | | | | | | | Merge branch 'winh-notes-service-applySuggestion' into 'master'Fatih Acet2019-07-054-10/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Remove applySuggestion from notes service See merge request gitlab-org/gitlab-ce!30399
| * | | | | | | Remove applySuggestion from notes serviceWinnie Hellmann2019-07-054-10/+11
|/ / / / / / /
* | | | | | | Merge branch '64176-fix-error-handling' into 'master'Mayra Cabrera2019-07-054-5/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix invalid SSL certificate errors on Drone CI service See merge request gitlab-org/gitlab-ce!30422
| * | | | | | | Add OpenSSL::OpenSSLError to HTTP_ERRORSDouglas Barbosa Alexandre2019-07-054-5/+19
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some services can raise OpenSSL::X509::CertificateError due to an invalid SSL certificates, with OpenSSL::OpenSSLError we can handle these errors.
* | | | | | | Merge branch 'dm-queue-mirror-jobs-in-batches-drain-ce' into 'master'Bob Van Landuyt2019-07-051-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add queue_size method to ApplicationWorker See merge request gitlab-org/gitlab-ce!30416