summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Refactor passing props to jobs/index.jsAmmar Alakkad2019-08-052-9/+22
|
* Merge branch 'review-app-stop' into 'master'Achilleas Pipinellis2019-08-052-4/+3
|\ | | | | | | | | Fix docs review-app stages in the pipeline See merge request gitlab-org/gitlab-ce!31464
| * Fix docs review-app stages in the pipelineMarcel Amirault2019-08-052-4/+3
|/
* Merge branch 'jprovazn-fix-positioning' into 'master'Sean McGivern2019-08-055-78/+168
|\ | | | | | | | | Optimize relative re-positioning See merge request gitlab-org/gitlab-ce!30938
| * Use SQL to find the gap instead of iteratingHeinrich Lee Yu2019-08-054-147/+92
| | | | | | | | Also removes unnecessary methods causing extra queries
| * Optimize rebalancing of relative positioningJan Provaznik2019-08-053-25/+170
| | | | | | | | | | | | | | | | Moving of neighbour items was done recursively - this was extremely expensive when multiple items had to be moved. This change optimizes the code to find nearest possible gap where items can be moved and moves all of them with single update query.
* | Merge branch '60664-kubernetes-applications-uninstall-cert-manager' into ↵Thong Kuah2019-08-057-11/+79
|\ \ | | | | | | | | | | | | | | | | | | 'master' Resolve "Kubernetes > Applications > Uninstall Cert Manager" See merge request gitlab-org/gitlab-ce!31166
| * | Allow Cert-Manager to be uninstalled60664-kubernetes-applications-uninstall-cert-managerTiger2019-08-057-11/+79
| | | | | | | | | | | | | | | | | | Our current version of Cert-Manager does not uninstall cleanly, and we must manually remove custom resource definitions.
* | | Merge branch ↵Kushal Pandya2019-08-056-2/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'update-pipelines-minutes-expiry-banner-to-an-alert-component-type' into 'master' Enhance style of the shared runners limit See merge request gitlab-org/gitlab-ce!31386
| * | | Enhance style of the shared runners limitAmmar Alakkad2019-08-056-2/+14
|/ / / | | | | | | | | | It also prepare for the EE merge request https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14786
* | | Merge branch 'ce-mw-updgrade-gitlab-ui-5-12-1' into 'master'Kushal Pandya2019-08-050-0/+0
|\ \ \ | | | | | | | | | | | | | | | | (CE Port) Upgrade gitlab-ui to 5.12.1 See merge request gitlab-org/gitlab-ce!31466
| * | | Upgrade gitlab-ui to 5.12.1ce-mw-updgrade-gitlab-ui-5-12-1Martin Wortschack2019-08-052-7/+7
| | | | | | | | | | | | | | | | - Update yarn.lock
* | | | Merge branch 'renovate/gitlab-ui-5.x' into 'master'Kushal Pandya2019-08-052-7/+7
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Update dependency @gitlab/ui to v5.12.1 See merge request gitlab-org/gitlab-ce!31461
| * | | Update dependency @gitlab/ui to v5.12.1Lukas Eipert2019-08-052-7/+7
| | | |
* | | | Merge branch 'prefer-to-use-process-pipeline-worker' into 'master'Sean McGivern2019-08-057-13/+31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Extend PipelineProcessWorker to accept a list of builds See merge request gitlab-org/gitlab-ce!31425
| * | | | Extend PipelineProcessWorker to accept a list of buildsprefer-to-use-process-pipeline-workerKamil Trzciński2019-08-027-13/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes used worker from `BuildProcessWorker` to `PipelineProcessWorker` to make pipeline processing much simpler. We process `pipeline_id`, based on some triggers.
* | | | | Merge branch 'keyboard-shortcuts' into 'master'Kushal Pandya2019-08-051-5/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix display of performance bar shortcut help text See merge request gitlab-org/gitlab-ce!31403
| * | | | | Fix display of performance bar shortcut help textMarcel Amirault2019-08-051-5/+5
|/ / / / /
* | | | | Merge branch '64341-user-callout-deferred-link-support' into 'master'Kushal Pandya2019-08-054-2/+123
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for deferred links in persistent user callouts. Closes #64341 See merge request gitlab-org/gitlab-ce!30818
| * | | | | Add support for deferred links in persistent user calloutsDennis Tang2019-08-054-2/+123
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Persistent user callouts now support deferred links, which are links that can be used to dismiss the callout, and then proceed to follow the link's original location. This ensures that the callout dismissal is properly recorded before the user leaves the page.
* | | | | Merge branch 'georgekoltsov/55474-outbound-setting-system-hooks' into 'master'Rémy Coutable2019-08-0536-75/+258
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add outbound setting for system hooks See merge request gitlab-org/gitlab-ce!31177
| * | | | | Replace add_column_with_default to add_columngeorgekoltsov/55474-outbound-setting-system-hooksGeorge Koltsov2019-08-021-6/+4
| | | | | |
| * | | | | Add backwards compatibility for legacy settingGeorge Koltsov2019-08-028-5/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `allow_local_requests_for_hooks_and_services` was renamed to `allow_local_requests_for_web_hooks_and_services`.
| * | | | | Refactor SystemHookUrlValidator and specsGeorge Koltsov2019-08-0216-114/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify SystemHookUrlValidator to inherit from PublicUrlValidator Refactor specs to move out shared examples to be used in both system hooks and public url validators.
| * | | | | Update security/webhooks.md doc page & specsGeorge Koltsov2019-08-025-46/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updating security/webhooks.md to match new behaviour as well as drying up few specs to extract shared examples
| * | | | | Update translations in gitlab.potGeorge Koltsov2019-08-025-4/+13
| | | | | |
| * | | | | Add SystemHookUrlValidator specGeorge Koltsov2019-08-021-0/+51
| | | | | |
| * | | | | Add changelog entryGeorge Koltsov2019-08-021-0/+5
| | | | | |
| * | | | | Add outbound requests setting for system hooksGeorge Koltsov2019-08-0223-34/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR adds new application setting to network section `allow_local_requests_from_system_hooks`. Prior to this change system hooks were allowed to do local network requests by default and we are adding an ability for admins to control it.
* | | | | | Merge branch 'tc-reanble-running-quarantined-specs' into 'master'Rémy Coutable2019-08-051-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Again run quarantine specs if tag provided See merge request gitlab-org/gitlab-ce!31414
| * | | | | | Again run quarantine specs if tag providedtc-reanble-running-quarantined-specsToon Claes2019-08-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In f59438c0a9da7bb4d98291d2adedfc5a13a50798 we changed how quarantined specs are excluded. But that made it impossible to run them by providing `--tag quarantine`, this changes that.
* | | | | | | Merge branch 'fix-design-management-router-ce' into 'master'Rémy Coutable2019-08-052-14/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE Backport for gitlab-ee!14741 (Fix design management router) See merge request gitlab-org/gitlab-ce!31090
| * | | | | | | Rewrite issues show spec as a feature specfix-design-management-router-ceLuke Duncalfe2019-08-051-14/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This spec needs to run as a request-style spec in order to invoke the Rails router. A controller-style spec matches the wrong route, and `session['user_return_to']` becomes incorrect.
| * | | | | | | CE-backport of designs routeLuke Duncalfe2019-08-051-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14741
* | | | | | | | Merge branch 'properly-process-all-needs' into 'master'Sean McGivern2019-08-054-17/+93
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly process all needs Closes #65488 See merge request gitlab-org/gitlab-ce!31415
| * | | | | | | | Properly process `needs:` with `when:`properly-process-all-needsKamil Trzciński2019-08-024-17/+93
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, some of the jobs with `needs:` would be processed in stages, it means that `when:` for such jobs would not be respected. This changes the behavior to have a separate execution paths for jobs with `needs:`.
* | | | | | | | Merge branch 'GL-12757' into 'master'Sean McGivern2019-08-052-2/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase clair scanner from v11 to v12 See merge request gitlab-org/gitlab-ce!30809
| * | | | | | | | provide a more descriptive changelog entrymo khan2019-08-021-1/+1
| | | | | | | | |
| * | | | | | | | change merge request idmo khan2019-08-021-1/+1
| | | | | | | | |
| * | | | | | | | add changelog entrymo2019-08-021-0/+5
| | | | | | | | |
| * | | | | | | | increase clair local scan versionmo2019-08-021-1/+1
| | | | | | | | |
| * | | | | | | | increase clair from v11 to v12mo2019-08-021-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'bvl-fix-sentry-error-grouping' into 'master'Sean McGivern2019-08-051-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Group `parent not preloaded` errors in sentry See merge request gitlab-org/gitlab-ce!31424
| * | | | | | | | | Group `parent not preloaded` errors in sentryBob Van Landuyt2019-08-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I still haven't found a moment to look into the exact cases that causes this error, but we're not loosing any information this way. In fact, it will be easier to find the right information as we only need to look to one entry in Sentry.
* | | | | | | | | | Merge branch 'telemetry-70-remove-pendo-poc-from-staging' into 'master'Kushal Pandya2019-08-051-1/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport: Removed pendo poc code See merge request gitlab-org/gitlab-ce!31307
| * | | | | | | | | Removed pendo poc codetelemetry-70-remove-pendo-poc-from-stagingDonald Cook2019-07-301-1/+0
| | | | | | | | | |
* | | | | | | | | | Merge branch 'brodock/fix-geo-upgrade-docs' into 'master'Evan Read2019-08-051-18/+16
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Geo: Some update instructions should be for 9.0.x only See merge request gitlab-org/gitlab-ce!31345
| * | | | | | | | | | Geo: Some update instructions should be for 9.0.x onlyGabriel Mazetto2019-08-051-18/+16
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '9928-apex-sast-analyzer-docs' into 'master'Achilleas Pipinellis2019-08-052-18/+20
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add pmd-apex sast analyzer to sast docs See merge request gitlab-org/gitlab-ce!31024
| * | | | | | | | | Add pmd-apex sast analyzer to sast docsLucas Charles2019-08-052-18/+20
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes documentation for new Apex (Salesforce) analyzer