summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Only use backslash escapes in autocomplete when neededmarkdown-autocomplete-escapingSean McGivern2019-04-173-7/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Autocompletion for references happens on the frontend. Those references are turned into actual references on the backend, but only after Markdown processing has happened. That means that if a reference contains a character that Markdown might consume, it won't render correctly. So we need to do some escaping on the frontend. We have these potential problem characters: https://docs.gitlab.com/ee/user/markdown.html#emphasis 1. ~ - this is ~~strikethrough~~, but only when doubled. 2. _ - used for _emphasis_, doubled is __bold__. 3. * - also used for *emphasis*, doubled is **bold** also. 4. ` - used for `code spans`, any number works. We don't need to escape `-` any more. When it comes to being inside a word: 1. a~~b~~ has strikethrough, so it needs to be escaped everywhere. 2. a_b_ has no emphasis (see [a]) so it only needs to be escaped at the start and end of words. 3. a*b* has emphasis, so it needs to be escaped everywhere. 4. a`b` has a code span, so it needs to be escaped everywhere. Or, in code terms: 1. Always escape ~~, *, and ` when being inserted by autocomplete. 2. Escape _ when it's either at the beginning or the end of a word. [a]: https://docs.gitlab.com/ee/user/markdown.html#multiple-underscores-in-words
* Merge branch '24704-restore-download-repository-path' into 'master'Rémy Coutable2019-04-1718-76/+204
|\ | | | | | | | | | | | | Restore "download repository path" feature, now with fixes and a feature flag Closes gitlab-workhorse#218 and #24704 See merge request gitlab-org/gitlab-ce!27275
| * Fix styling issues with the download dropdownNick Thomas2019-04-163-26/+23
| |
| * Add a feature flag for subdirectory archivesNick Thomas2019-04-163-41/+94
| |
| * JSON-encoded binary fields should use Base64::encode64Nick Thomas2019-04-162-2/+7
| | | | | | | | | | | | | | It is not interoperable to use Base64::urlsafe_encode64 for fields in JSON that contain binary (as opposed to UTF8-safe) data. For instance, the Golang JSON decoder (which is what gitlab-workhorse uses) insists upon the standard base64 encoding.
| * Revert "Revert "Merge branch '24704-download-repository-path' into 'master'""Nick Thomas2019-04-1618-63/+136
| | | | | | | | This reverts commit 171818df0a72097aa1a804c8213666b3f66b0966.
* | Merge branch 'dm-code-review-sla' into 'master'Nick Thomas2019-04-171-8/+31
|\ \ | | | | | | | | | | | | Rewrite "Review turnaround time" section in light of Global Optimization value See merge request gitlab-org/gitlab-ce!27411
| * | Refer to guidelines on when to assign MRs close to the freezedm-code-review-slaDouwe Maan2019-04-161-1/+4
| | |
| * | Rewrite "Review turnaround time" sectionDouwe Maan2019-04-161-8/+28
| | |
* | | Merge branch '60356-add-qa-tests-for-the-performance-bar' into 'master'Sanad Liaquat2019-04-1712-7/+147
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add QA tests for the performance bar" Closes #60356 See merge request gitlab-org/gitlab-ce!27305
| * | | Add QA tests for the performance bar60356-add-qa-tests-for-the-performance-barSean McGivern2019-04-1612-7/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are very high-level. Currently, they test: 1. That the performance bar appears. 2. That it has detailed metrics for Postgres and Gitaly. 3. That AJAX requests are included in the request selector.
* | | | Merge branch 'fix-extra-emails-for-custom-notifications' into 'master'Sean McGivern2019-04-176-19/+84
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix extra emails for custom notifications Closes #56861 See merge request gitlab-org/gitlab-ce!25607
| * | | | Fix unexpected extra notification mailsPatrick Derichs2019-04-176-19/+84
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using custom_action and recipient filtering Add more generic filtering to user_ids_notifiable_on Add changelog entry Remove commented class Method is no longer needed Overloading no longer required Filter by action just in case of custom notification level Add participant check Fix unexpected extra notification mails Using custom_action and recipient filtering Add more generic filtering to user_ids_notifiable_on Add changelog entry Remove commented class Method is no longer needed Overloading no longer required Filter by action just in case of custom notification level Fix comment Add repond_to? checks Reverted custom_action filtering Enhanced output of should_email helper Changed :watch to :participating for custom notifiable users Change spec variable name Enhanced participating check These conditions are no longer needed Fix custom notification handling for participating type Participating level should include maintainers Fixed add_guest notification Fix successful pipeline notification Refactoring: Use maintainer? method on team instead Add spec for new_issue: true for a custom group setting which should have lower prio than an available project setting Clean up specs
* | | | Merge branch 'docs/merge-request-pipelines' into 'master'Achilleas Pipinellis2019-04-171-1/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add note about MR Pipeline Runner version Closes gitlab-ee#11122 See merge request gitlab-org/gitlab-ce!27330
| * | | | Add note about MR Pipeline Runner versiondocs/merge-request-pipelinesSteve Azzopardi2019-04-171-1/+7
| | | | |
* | | | | Merge branch 'patch-39' into 'master'Achilleas Pipinellis2019-04-171-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs: Fix typo on DB migration See merge request gitlab-org/gitlab-ce!27435
| * | | | | Fix typo [skip ci]Katrin Leinweber2019-04-161-1/+1
| | | | | |
* | | | | | Merge branch 'docs/external-prometheus-updates' into 'master'Achilleas Pipinellis2019-04-171-2/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update external prometheus config See merge request gitlab-org/gitlab-ce!27439
| * | | | | | Update external prometheus configdocs/external-prometheus-updatesCindy Pallares2019-04-161-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated to include missing metrics: * GitLab Workhorse * Nginx * Sidekiq
* | | | | | | Merge branch '10083-dropdown-ce-ee-difference' into 'master'Filipa Lacerda2019-04-174-6/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE diffs for dropdown_value_collapsed.vue Closes gitlab-ee#10083 See merge request gitlab-org/gitlab-ce!27367
| * | | | | | | Removes EE diffs for dropdown_value_collapsed10083-dropdown-ce-ee-differenceDenys Mishunov2019-04-154-6/+16
| | | | | | | |
* | | | | | | | Merge branch '9956-move-ee-differences' into 'master'Filipa Lacerda2019-04-171-0/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of "Resolves EE differences for project_new.js" See merge request gitlab-org/gitlab-ce!27285
| * | | | | | | | Backport of "Resolves EE differences for project_new.js"Donald Cook2019-04-171-0/+6
|/ / / / / / / /
* | | | | | | | Merge branch 'kmcknight-group-typo' into 'master'Achilleas Pipinellis2019-04-171-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo See merge request gitlab-org/gitlab-ce!27443
| * | | | | | | | Fix typoKen McKnight2019-04-171-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch '59831-related-items-scss-cleanup-ce' into 'master'Filipa Lacerda2019-04-173-235/+211
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix stylelint warnings in related_items_list.scss See merge request gitlab-org/gitlab-ce!27432
| * | | | | | | | Fix stylelint warnings in related_items_list.scss59831-related-items-scss-cleanup-ceAnnabel Dunstone Gray2019-04-163-235/+211
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit rearranges the styles in related_items_list to adhere to stylelint's warnings. It also adds some utility classes where applicable
* | | | | | | | | Merge branch 'boards-stylelint' into 'master'Filipa Lacerda2019-04-1717-241/+60
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix stylelint rules in boards.scss Closes #59895 See merge request gitlab-org/gitlab-ce!27313
| * | | | | | | | | Fix stylelint rules in boards.scssPhil Hughes2019-04-1617-241/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59895
* | | | | | | | | | Merge branch 'filipa-master-patch-09545' into 'master'Phil Hughes2019-04-171-31/+11
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes ifEE example for JS code. See merge request gitlab-org/gitlab-ce!27408
| * | | | | | | | | | Removes ifEE example for JS codefilipa-master-patch-09545Filipa Lacerda2019-04-161-31/+11
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '59275-cluster-form-hints' into 'master'Phil Hughes2019-04-174-15/+39
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add help texts to K8 form fields Closes #59275 See merge request gitlab-org/gitlab-ce!27274
| * | | | | | | | | | | Add help texts to K8 form fieldsEnrique Alcántara2019-04-174-15/+39
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'fix-logic-in-43263-git-push-option-to-create-mr-test' into ↵11-11-auto-deploy-0012345Lin Jen-Shin2019-04-171-4/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix logic in Api::Internal test See merge request gitlab-org/gitlab-ce!27193
| * | | | | | | | | | | Fix logic in Api::Internal testfix-logic-in-43263-git-push-option-to-create-mr-testLuke Duncalfe2019-04-171-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The intention of this test is to ensure that the service class MergeRequests::PushOptionsHandlerService does not run when the :mr_push_options feature flag is disabled. This test was passing, however was not testing what it was supposed to be! For one, setting Feature.disable(:feature) in the test does not disable the feature, as rspec config in spec_helper stubs Feature to make all features enabled: https://gitlab.com/gitlab-org/gitlab-ce/commit/3ee48e422defaedd69946c607bd8d3672e510375 So the feature was still enabled in the test. But this test wasn't failing because unfortunately I had put: ``` expect(MergeRequests::PushOptionsHandlerService).to receive(:new) ``` instead of not_to! This meant that the `.new` method was being stubbed, so the service class did not create a MergeRequest, which satisfied the second expectation. ``` expect(MergeRequests::PushOptionsHandlerService).to receive(:new) ```
* | | | | | | | | | | | Merge branch 'tortuetorche/gitlab-ce-patch-auto-deploy-extra-values' into ↵Grzegorz Bizon2019-04-173-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Allow extra args for helm in Auto-DevOps See merge request gitlab-org/gitlab-ce!26838
| * | | | | | | | | | | | Rename HELM_EXTRA_ARGS to differentiate between helm invocationstortuetorche/gitlab-ce-patch-auto-deploy-extra-valuesJames Fargher2019-04-172-4/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | Apply suggestion to doc/topics/autodevops/index.mdJames Fargher2019-04-111-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Apply suggestion to doc/topics/autodevops/index.mdJames Fargher2019-04-101-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add HELM_EXTRA_ARGS to all Auto-DevOps helm invocationsJames Fargher2019-04-083-0/+7
| | | | | | | | | | | | |
| * | | | | | | | | | | | Allows extra arguments in helm commands for auto-deploying applicationTortue Torche2019-04-081-0/+2
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'fix-sidebar-spec-master' into 'master'Michael Kozono2019-04-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE backport] Fix no assignee text in sidebar_spec See merge request gitlab-org/gitlab-ce!27444
| * | | | | | | | | | | | Fix no assignee text in sidebar_specfix-sidebar-spec-masterLuke Bennett2019-04-171-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch '58361-issue-create-system-note-timestamp' into 'master'Stan Hu2019-04-164-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set correct timestamps when creating past issues Closes #58361 See merge request gitlab-org/gitlab-ce!27406
| * | | | | | | | | | | | Set correct timestamps when creating past issues58361-issue-create-system-note-timestampHeinrich Lee Yu2019-04-164-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sets `system_note_timestamp` from `created_at`
* | | | | | | | | | | | | Merge branch 'none-for-assignees' into 'master'Annabel Dunstone Gray2019-04-164-13/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `None` for assignees Closes #60599 See merge request gitlab-org/gitlab-ce!27419
| * | | | | | | | | | | | | `None` for assigneesVictor Wu2019-04-164-13/+13
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update assignees_spec.js Update sidebar_spec.rb Update issues_spec.rb
* | | | | | | | | | | | | Merge branch 'zj-git-2.21-tests' into 'master'Douglas Barbosa Alexandre2019-04-166-9/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test using Git 2.21 See merge request gitlab-org/gitlab-ce!27418
| * | | | | | | | | | | | Update preflight check to require 2.21zj-git-2.21-testsZeger-Jan van de Weg2019-04-161-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Update source install docs for Git 2.21Zeger-Jan van de Weg2019-04-161-4/+4
| | | | | | | | | | | | |