summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Use the 'needs' keyword for 'package-and-qa-always' jobRémy Coutable2019-08-261-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'id-code-review-smau' into 'master'Lin Jen-Shin2019-08-267-2/+35
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add usage pings for merge request creating See merge request gitlab-org/gitlab-ce!32059
| * | | | | | | Add usage pings for merge request creatingIgor2019-08-267-2/+35
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Code Review Usage Ping for Create SMAU
* | | | | | | Merge branch 'zj-remove-object-pools-feature-flag' into 'master'Nick Thomas2019-08-264-55/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the object pools feature flag See merge request gitlab-org/gitlab-ce!32204
| * | | | | | | Remove the object pools feature flagZeger-Jan van de Weg2019-08-264-55/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The flag defaulted to true, so there's no change unless users turned it off. Given there's a lack of issues regarding object pools, this should be OK.
* | | | | | | | Merge branch 'qa-copy-license-file-in-qa-image' into 'master'Lin Jen-Shin2019-08-262-1/+11
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Copy `ee/app/models/license.rb` in the QA image if present See merge request gitlab-org/gitlab-ce!32111
| * | | | | | | Copy ee/app/models/license.rb in the QA image if presentqa-copy-license-file-in-qa-imageRémy Coutable2019-08-262-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'pl-rubocop-include-exclude' into 'master'Sean McGivern2019-08-2613-112/+67
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Utilize RuboCop's Include/Exclude config See merge request gitlab-org/gitlab-ce!32098
| * | | | | | | | Utilize RuboCop's Include/Exclude configPeter Leitzen2019-08-2613-112/+67
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Stop checking the file location programmatically.
* | | | | | | | Merge branch 'renovate/gitlab-packages' into 'master'Filipa Lacerda2019-08-262-5/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/ui to v5.19.0 See merge request gitlab-org/gitlab-ce!32202
| * | | | | | | Update dependency @gitlab/ui to v5.19.0Lukas Eipert2019-08-262-5/+5
| |/ / / / / /
* | | | | | | Merge branch 'pl-danger-map-rubocop' into 'master'Ash McKenzie2019-08-261-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Danger: Map .rubocop{,_todo}.yml to ~backend See merge request gitlab-org/gitlab-ce!32156
| * | | | | | | Danger: Map .rubocop{,_todo}.yml to ~backendPeter Leitzen2019-08-261-0/+1
|/ / / / / / /
* | | | | | | Merge branch ↵Nick Thomas2019-08-263-1/+28
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '66443-unrecoverable-configuration-loop-in-external-auth-control' into 'master' Resolve "Unrecoverable configuration loop in external auth control" Closes #66443 See merge request gitlab-org/gitlab-ce!32102
| * | | | | | Add more tests to cover all cases66443-unrecoverable-configuration-loop-in-external-auth-controlRobert Schilling2019-08-221-0/+12
| | | | | | |
| * | | | | | Add test, reduce complexityRobert Schilling2019-08-222-2/+11
| | | | | | |
| * | | | | | Don't check external authorization when disabling the serviceRobert Schilling2019-08-222-1/+7
| | | | | | |
* | | | | | | Merge branch '21505-quickactions-update-pd' into 'master'Kamil Trzciński2019-08-2610-32/+197
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply quickactions when modifying comments See merge request gitlab-org/gitlab-ce!31136
| * | | | | | | Add edit_note and spec for editing quick actionsPatrick Derichs2019-08-2610-32/+197
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call QuickActionsService on Note update Add support for notes which just contain commands after editing Return http status gone (410) if note was deleted Temporary frontend addition so it is not failing when a note is deleted Move specs to shared examples Fix rubocop style issue Deleting note on frontend when status is 410 Use guard clause for note which got deleted Simplified condition for nil note This method should no longer be called with nil note Refactoring of execute method to reduce complexity Move errors update to delete_note method Note is now deleted visually when it only contains commands after update Add expectation Fix style issues Changing action to fix tests Add tests for removeNote and update deleteNote expectations
* | | | | | | Merge branch 'da/ignore-tests-in-security-reports' into 'master'Rémy Coutable2019-08-261-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dont run SAST on tests See merge request gitlab-org/gitlab-ce!32011
| * | | | | | | Dont run SAST on testsDennis Appelt2019-08-261-0/+1
|/ / / / / / /
* | | | | | | Merge branch 'patch-73' into 'master'Sean McGivern2019-08-261-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update gitlab_schema.rb to fix typo See merge request gitlab-org/gitlab-ce!32200
| * | | | | | | Update gitlab_schema.rb to fix typoLucy Fox2019-08-261-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'docs-fix-health-check-docs-syntax-error' into 'master'Achilleas Pipinellis2019-08-261-8/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate text in health check doc See merge request gitlab-org/gitlab-ce!32175
| * | | | | | | Remove duplicate text in health check docdocs-fix-health-check-docs-syntax-errorSean Arnold2019-08-241-8/+0
| | | | | | | |
* | | | | | | | Merge branch 'db_load_balancing_service_discovery_srv' into 'master'Kamil Trzciński2019-08-263-2/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DB Load Balancing: Support SRV lookups See merge request gitlab-org/gitlab-ce!32135
| * | | | | | | | CE port: allow SRV records in DB service discoverydb_load_balancing_service_discovery_srvTiger2019-08-233-2/+19
| | | | | | | | |
* | | | | | | | | Merge branch 'docs-upgrade-gosec-url-data-to-partially-reliable' into 'master'Achilleas Pipinellis2019-08-261-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update docs - SAST golang analyzer URLs are partially reliable See merge request gitlab-org/gitlab-ce!32164
| * | | | | | | | | Update docs - SAST golang analyzer URLs are partially reliabledocs-upgrade-gosec-url-data-to-partially-reliableLucas Charles2019-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With https://gitlab.com/gitlab-org/security-products/analyzers/gosec/merge_requests/18 we have added some basic URLs to our gosec analyzer, upgrading data from none to partially reliable
* | | | | | | | | | Merge branch 'docs-add-examples-for-secure-excluded-paths-usage' into 'master'Achilleas Pipinellis2019-08-262-24/+28
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add example usage of `SAST_EXCLUDED_PATHS` See merge request gitlab-org/gitlab-ce!32120
| * | | | | | | | | | Add example usage to SAST/DS docs for file exclusiondocs-add-examples-for-secure-excluded-paths-usageLucas Charles2019-08-232-25/+25
| | | | | | | | | | |
| * | | | | | | | | | Use common terminology for SAT/DS table headersLucas Charles2019-08-231-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Add headers to missing SAST doc tablesLucas Charles2019-08-231-0/+4
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'docs-update-forking-workflow' into 'master'Achilleas Pipinellis2019-08-266-4/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Replace old screenshots in project forking workflow See merge request gitlab-org/gitlab-ce!31869
| * | | | | | | | | | Docs: Replace old screenshots in project forking workflowTristan Williams2019-08-266-4/+3
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs-clarify-no-changelog-for-docs-only-changes' into 'master'Achilleas Pipinellis2019-08-261-0/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add changelog exclusion language for docs-only changes See merge request gitlab-org/gitlab-ce!32123
| * | | | | | | | | | Add changelog exclusion language for docs-only changesLucas Charles2019-08-261-0/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'renovate/gitlab-packages' into 'master'Kushal Pandya2019-08-262-5/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/svgs to ^1.70.0 See merge request gitlab-org/gitlab-ce!32162
| * | | | | | | | | | Update dependency @gitlab/svgs to ^1.70.0Lukas Eipert2019-08-232-5/+5
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'sh-upgrade-ruby-prof' into 'master'Ash McKenzie2019-08-262-3/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump ruby-prof to 1.0.0 See merge request gitlab-org/gitlab-ce!29588
| * | | | | | | | | | Bump ruby-prof to 1.0.0sh-upgrade-ruby-profStan Hu2019-08-242-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is significant improvement over the previous releases: https://github.com/ruby-prof/ruby-prof/blob/master/CHANGES
* | | | | | | | | | | Merge branch 'add-unleash-gem' into 'master'Thong Kuah2019-08-262-0/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Install Unleash Client Gem See merge request gitlab-org/gitlab-ce!32065
| * | | | | | | | | | | Install Unleash Client GemJason Goodman2019-08-262-0/+5
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'ee-10586-geo-object-storage-replication' into 'master'Ash McKenzie2019-08-261-0/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport expired job artifact trait See merge request gitlab-org/gitlab-ce!32179
| * | | | | | | | | | Backport expired job artifact traitee-10586-geo-object-storage-replicationGabriel Mazetto2019-08-241-0/+4
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'fix-migration-helper' into 'master'Stan Hu2019-08-254-3/+148
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add helpers to exactly undo cleanup_concurrent_column_rename See merge request gitlab-org/gitlab-ce!32183
| * | | | | | | | | Add helper to exactly undo cleanup_concurrent_column_renameReuben Pereira2019-08-254-3/+148
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | - Also add helper to undo rename_column_concurrently.
* | | | | | | | | Merge branch 'mc/bug/nplusone-pipelines-show' into 'master'Stan Hu2019-08-241-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preload tags when loading Ci::Pipeline Closes #60925 See merge request gitlab-org/gitlab-ce!32149
| * | | | | | | | | Preload tags when loading Ci::Pipelinemc/bug/nplusone-pipelines-showMatija Čupić2019-08-231-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch '64764-fix-serverless-layout' into 'master'Fatih Acet2019-08-242-1/+6
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Serverless entry page layout Closes #64764 See merge request gitlab-org/gitlab-ce!32029