summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | 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
| * | | | | | | | Fix serverless entry page layout64764-fix-serverless-layoutEnrique Alcantara2019-08-202-1/+6
| | | | | | | | |
* | | | | | | | | Merge branch ↵Tim Zallmann2019-08-246-15/+29
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '66073-use-time-series-chart-instead-of-area-chart-in-panel_types' into 'master' Enable line charts in dashbaord panels and embedded charts Closes #66073 See merge request gitlab-org/gitlab-ce!31920
| * | | | | | | | Add changelog entry66073-use-time-series-chart-instead-of-area-chart-in-panel_typesMiguel Rincon2019-08-211-0/+5
| | | | | | | | |
| * | | | | | | | Replace the area with time series where usedMiguel Rincon2019-08-215-15/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Replace in panel_type.vue - Replace in embed.vue - Port changes to support embed in 2 cols in large screens - Update specs
| * | | | | | | | Add karma test for time_series.vueMiguel Rincon2019-08-211-321/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New spec file for time_series.vue written using karma. New spec extends the spec from area.vue
| * | | | | | | | This commit adds a new time series componentMiguel Rincon2019-08-211-0/+321
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a time series component for line and area charts. Displays new charts in the dashboard. - Use dynamic components for line/area swapping - Add new line charts to dashboard in 2 panels
* | | | | | | | | Merge branch 'fix-migration' into 'master'Stan Hu2019-08-242-0/+13
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete rename trigger before creating to prevent error See merge request gitlab-org/gitlab-ce!32147
| * | | | | | | | | Drop existing trigger before creating new oneReuben Pereira2019-08-242-0/+13
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - When renaming a column concurrently, drop any existing trigger before attempting to create a new one. When running migration specs multiple times (as it happens during local development), the down method of previous migrations are called. If any of the called methods contains a call to rename_column_concurrently, a trigger will be created and not removed. So, the next time a migration spec is run, if the same down method is executed again, it will cause an error when attempting to create the trigger (since it already exists). Dropping the trigger if it already exists will prevent this problem.
* | | | | | | | | Merge branch '56883-migration' into 'master'Mayra Cabrera2019-08-239-264/+709
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add migration to execute SelfMonitoring::Project::CreateService See merge request gitlab-org/gitlab-ce!31389
| * | | | | | | | | Add a link to docs in project descriptionReuben Pereira2019-08-239-264/+709
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Add to the service and migration both.
* | | | | | | | | Merge branch 'fe-fix-issuable-sidebar-icon-of-notification-disabled' into ↵Mike Greiling2019-08-233-3/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix issuable sidebar icon of notification disabled See merge request gitlab-org/gitlab-ce!32134
| * | | | | | | | | Fix issuable sidebar icon of notification disabledPaul Slaughter2019-08-233-3/+10
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | by adding the proper notification icon
* | | | | | | | | Merge branch 'docs/fix-template-link' into 'master'Mike Lewis2019-08-231-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix link to issue template See merge request gitlab-org/gitlab-ce!32144
| * | | | | | | | | Fix link to issue templateAchilleas Pipinellis2019-08-231-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch '64505-add-rubocop-cop-to-enforce-string-length-on-migrations' ↵Stan Hu2019-08-2373-51/+431
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Adds cop to enforce string limits on migrations See merge request gitlab-org/gitlab-ce!31433
| * | | | | | | | | Adds cop to enforce string limits on migrationsMayra Cabrera2019-08-2373-51/+431
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This cop will analyze migrations that add columns with string, and report an offense if the string has no limit enforced Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/64505
* | | | | | | | | Merge branch ↵Mayra Cabrera2019-08-239-11/+93
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '55999-misleading-pipeline-tooltip-messages-and-misleading-ci-status-icons-on-simple-commits' into 'master' Change misleading pipeline status tooltip See merge request gitlab-org/gitlab-ce!31861
| * | | | | | | | | Change misleading pipeline status tooltipScott Hampton2019-08-239-11/+93
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some pipeline status icon tooltips were showing "Commit: ..." which customers found to be misleading since it was not the commit that was failing but the pipeline. We are changing all status icon tooltips to say "Pipeline: ..." instead of "Commit: ..." now.
* | | | | | | | | Merge branch '66402-use-visual-review-tools-npm-package' into 'master'Mike Greiling2019-08-2327-1217/+19
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Use Visual Review Tools NPM package" See merge request gitlab-org/gitlab-ce!32159
| * | | | | | | | | Move visual review toolbar to NPMshampton2019-08-2327-1217/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the visual review toolbar code in favor of using the NPM package.
* | | | | | | | | | Merge branch '64269-pipeline-api-fails-with-401' into 'master'Mayra Cabrera2019-08-234-1/+253
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Read pipelines from public projects though API See merge request gitlab-org/gitlab-ce!31816