summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix frozen string errorfrozen_string_lib_2Thong Kuah2019-08-231-1/+2
|
* Fix frozen string errorsThong Kuah2019-08-232-2/+2
|
* Add frozen_string_literal to lib part 2Thong Kuah2019-08-23199-0/+397
| | | | | Using the sed script from https://gitlab.com/gitlab-org/gitlab-ce/issues/59758
* Merge branch 'latest-pipeline' into 'master'Filipa Lacerda2019-08-224-3/+8
|\ | | | | | | | | Updated latest pipeline tag tooltip to be more descriptive See merge request gitlab-org/gitlab-ce!31624
| * Updated latest pipeline tag tooltip to be more descriptiveDimitrie Hoekstra2019-08-224-3/+8
|/
* Merge branch 'docs-ce-node-mdl-poc' into 'master'Achilleas Pipinellis2019-08-2238-89/+70
|\ | | | | | | | | Prepare the docs project for markdownlint See merge request gitlab-org/gitlab-ce!31960
| * Update docs to pass new markdownlintMarcel Amirault2019-08-2238-89/+70
|/ | | | | Deletes extra spaces and line, makes lists consistent, and fixes links.
* Merge branch ↵Kushal Pandya2019-08-226-0/+56
|\ | | | | | | | | | | | | 'ee-2502-refactor-ee-app-assets-javascripts-approvals-components-approvers_select-vue-to-remove-approverusers' into 'master' Add a new method to `Api.js`: `projectUsers` See merge request gitlab-org/gitlab-ce!31801
| * Add new API method: projectUsersee-2502-refactor-ee-app-assets-javascripts-approvals-components-approvers_select-vue-to-remove-approverusersHimanshu Kapoor2019-08-193-0/+42
| | | | | | | | | | The new API method projectUsers gets all the users added to a particular project.
| * Add a skip_users filter to the project users APINick Thomas2019-08-193-0/+14
| | | | | | | | | | | | This functionality is available in the /autocomplete users pseudo-API. We're attempting to replace that with the canonical API, so it needs support for this parameter too.
* | Merge branch 'docs/license-compliance' into 'master'Achilleas Pipinellis2019-08-2210-39/+39
|\ \ | | | | | | | | | | | | | | | | | | Rename License Management to License Compliance Closes #63329 See merge request gitlab-org/gitlab-ce!31590
| * | Rename License Management to License ComplianceAchilleas Pipinellis2019-08-2210-39/+39
|/ / | | | | | | | | | | As part of https://gitlab.com/gitlab-org/gitlab-ee/issues/8910, all occurrences of License Management are replace with License Compliance.
* | Merge branch 'po-inforef-feature-flags' into 'master'Stan Hu2019-08-221-2/+4
|\ \ | | | | | | | | | | | | Add Gitaly info-ref cache feature flags See merge request gitlab-org/gitlab-ce!31890
| * | Add Gitaly info-ref cache feature flagsPaul Okstad2019-08-221-2/+4
|/ /
* | Merge branch 'disable-dast-on-master' into 'master'Rémy Coutable2019-08-223-18/+22
|\ \ | | | | | | | | | | | | Ensure the `dast` job does not run on `master` See merge request gitlab-org/gitlab-ce!32047
| * | Ensure the dast job does not run on masterdisable-dast-on-masterRémy Coutable2019-08-213-18/+22
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'add-nonce-js-views' into 'master'Kushal Pandya2019-08-221-1/+16
|\ \ \ | | | | | | | | | | | | | | | | Add CSP nonce when handling JS views See merge request gitlab-org/gitlab-ce!31839
| * | | Add CSP nonce when handling JS viewsadd-nonce-js-viewsHeinrich Lee Yu2019-08-221-1/+16
|/ / / | | | | | | | | | Prevents errors when we have CSP enabled
* | | Merge branch 'docs-fix-case-zm' into 'master'Achilleas Pipinellis2019-08-211-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Correct case of GitLab in section header See merge request gitlab-org/gitlab-ce!31879
| * | | Correct case of GitLab in section headerdocs-fix-case-zmZeff Morgan2019-08-151-1/+1
| | | |
* | | | Update VERSION to 12.3.0-prev12.3.0.preGitLab Release Tools Bot2019-08-211-1/+1
| | | |
* | | | Update CHANGELOG.md for 12.2.0GitLab Release Tools Bot2019-08-21217-1088/+240
| | | | | | | | | | | | [ci skip]
* | | | Merge branch 'sidekiq-interrupt-running-jobs-deadset' into 'master'Stan Hu2019-08-212-2/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Put cancelled job in DeadSet See merge request gitlab-org/gitlab-ce!32070
| * | | | Put cancelled job in DeadSetsidekiq-interrupt-running-jobs-deadsetKamil Trzciński2019-08-212-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | This replicates Sidekiq behavior of pushing dead job into DeadSet.
* | | | | Merge branch 'uncomment_commit_signatures_feature_flag' into 'master'Stan Hu2019-08-213-2/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade to gitaly 1.60.0 and uncomment get_commit_signatures feature flag Closes #65991 See merge request gitlab-org/gitlab-ce!31981
| * | | | | Upgrade Gitaly to v1.60.0uncomment_commit_signatures_feature_flagFelipe Artur2019-08-212-1/+6
| | | | | |
| * | | | | Uncomment get_commit_signatures feature flagFelipe Artur2019-08-191-1/+1
| | | | | |
* | | | | | Merge branch 'docs/edit-worker-information' into 'master'Achilleas Pipinellis2019-08-211-14/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edit of new Worker section See merge request gitlab-org/gitlab-ce!31992
| * | | | | | Edit of new Worker sectionEvan Read2019-08-211-14/+17
|/ / / / / /
* | | | | | Merge branch '328-other-ee' into 'master'Stan Hu2019-08-213-15/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port of EE "Elasticsearch versioned schema for other ActiveRecord models" See merge request gitlab-org/gitlab-ce!31660
| * | | | | | Remove links to issues to make docs lint happy328-other-eeStan Hu2019-08-211-6/+1
| | | | | | |
| * | | | | | Elasticsearch docs: Minor copyedits and add links to issuesStan Hu2019-08-211-2/+13
| | | | | | |
| * | | | | | ES: sync with EEMark Chao2019-08-213-15/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Doc for multi-indices archtecture
* | | | | | | Merge branch 'refactor/notes-getters' into 'master'Paul Slaughter2019-08-212-57/+112
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor nextUnresolvedDiscussionId and previousUnresolvedDiscussionId getters Closes #65817 See merge request gitlab-org/gitlab-ce!31754
| * | | | | | | Refactor nextUnresolvedDiscussionId and previousUnresolvedDiscussionId gettersArun Kumar Mohan2019-08-152-57/+112
| | | | | | | |
* | | | | | | | Merge branch 'demodulize-model-headers' into 'master'Mayra Cabrera2019-08-212-2/+80
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Demodulize model headers in emails See merge request gitlab-org/gitlab-ce!31968
| * | | | | | | | Handle namespaced modelsAlex Kalderimis2019-08-212-2/+80
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We encountered issues with setting module headers for namespaced models. These changes address this. We retain the namespacing, but transform the classnames to make them into safe email headers.
* | | | | | | | Merge branch '9703-track-clicks-on-the-issue-sidebars' into 'master'Clement Ho2019-08-2112-8/+82
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport: Resolve "Track clicks on the issue sidebars" See merge request gitlab-org/gitlab-ce!31435
| * | | | | | | | Backport: Issue sidebar trackingDonald Cook2019-08-2112-8/+82
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Added snowplow event tracking to Edit buttons
* | | | | | | | Merge branch 'replace-svg-message-with-empty-state' into 'master'Clement Ho2019-08-214-86/+56
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove svg component from Container Registry Closes #66371 See merge request gitlab-org/gitlab-ce!30845
| * | | | | | | | Fixed tech debt of using custom componentNick Kipling2019-08-214-86/+56
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the container registry to use the empty state component Removed the custom svg-component
* | | | | | | | Merge branch ↵Stan Hu2019-08-215-2/+65
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '64383-pattern-matching-with-variables-causes-gitlabs-ci-lint-to-throw-500' into 'master' Fix 500 errors caused by pattern matching with variables in CI Lint Closes #64383 See merge request gitlab-org/gitlab-ce!31719
| * | | | | | | | Ensure CI matching operator receives an objectMarius Bobin2019-08-215-2/+65
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure the evaluation of right-hand side expression always results in the returning of an object or an empty String
* | | | | | | | Merge branch 'sidekiq-interrupt-running-jobs' into 'master'Stan Hu2019-08-218-7/+650
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Allow to interrupt running sidekiq jobs See merge request gitlab-org/gitlab-ce!31818
| * | | | | | | Properly handle `sidekiq` skipsidekiq-interrupt-running-jobsKamil Trzciński2019-08-215-17/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transform `CancelledError` into `JobRetry::Skip`
| * | | | | | | Improve resillency of monitorKamil Trzciński2019-08-214-41/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Retry connection when it fails - Properly shutdown daemon - Stop monitor if the Exception is raised - Properly guard exception handling
| * | | | | | | Perform cheap thread findKamil Trzciński2019-08-212-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we process message that is not designated to us previously we would fire a separate Thread for that. We don't need to do it. We can cheaply check if thread is available, if it is, we can perform expensive operation then.
| * | | | | | | Rework `Sidekiq::JobsThreads` into `Monitor`Kamil Trzciński2019-08-219-180/+523
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes: - very shallow `Middleware::Monitor` to only request tracking of sidekiq jobs, - `SidekiqStatus::Monitor` to be responsible to maintain persistent connection to receive messages, - `SidekiqStatus::Monitor` to always use structured logging and instance variables
| * | | | | | | Allow to interrupt running jobsKamil Trzciński2019-08-214-0/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a middleware to track all threads for running jobs. This makes sidekiq to watch for redis-delivered notifications. This makes be able to send notification to interrupt running sidekiq jobs. This does not take into account any native code, as `Thread.raise` generates exception once the control gets back to Ruby. The separate measure should be taken to interrupt gRPC, shellouts, or anything else that escapes Ruby.
* | | | | | | | Merge branch 'consider-md-files-as-doc-in-danger-check' into 'master'Achilleas Pipinellis2019-08-211-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Danger consider .md files as documentation files See merge request gitlab-org/gitlab-ce!32056