summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 'respect-needs-on-artifacts' into 'master'Sean McGivern2019-08-022-12/+21
|\ | | | | | | | | | | | | Respect needs on artifacts Closes #65466 See merge request gitlab-org/gitlab-ce!31413
| * Respect needs for artifactsrespect-needs-on-artifactsKamil Trzciński2019-08-022-12/+21
| | | | | | | | | | | | When `needs:` is defined, the value of it is not respected when returning a list of artifacts to the runner from the job.
* | Merge branch 'leipert-improve-ansi2html' into 'master'Fatih Acet2019-08-027-44/+54
|\ \ | | | | | | | | | | | | Improve job log rendering performance See merge request gitlab-org/gitlab-ce!31262
| * | Prevent empty classes in ansi2html conversionLukas '+ alert('Eipi') + ' Eipert2019-08-027-44/+54
|/ / | | | | | | | | | | | | Currently we write out empty CSS classes (`class=""`) every time we create a new tag. This adds 9 unnecessary bytes per span element. In a recent trace, I have counted 11950 span elements. So we transported 105 unnecessary kilobytes!
* | Merge branch 'leipert-remove-docker-host' into 'master'Bob Van Landuyt2019-08-022-2/+2
|\ \ | | | | | | | | | | | | Resolve docker in docker problems See merge request gitlab-org/gitlab-ce!31417
| * | Use stable image version for dindleipert-remove-docker-hostLukas Eipert2019-08-022-2/+2
| | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-com/gl-infra/production/issues/1023 This also has been suggested by Tomasz in the MR
* | | Merge branch 'sync-vue-test-utils-helpers' into 'master'Paul Slaughter2019-08-023-36/+20
|\ \ \ | | | | | | | | | | | | | | | | Syncs the vue test utils helpers See merge request gitlab-org/gitlab-ce!31349
| * | | Syncs the vue test utils helpersSam Beckham2019-08-023-36/+20
|/ / /
* | | Merge branch 'sh-fix-performance-bar-warnings' into 'master'Sean McGivern2019-08-021-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fix performance bar warnings when Rugged is disabled Closes #65491 See merge request gitlab-org/gitlab-ce!31395
| * | Fix performance bar warnings when Rugged is disabledsh-fix-performance-bar-warningsStan Hu2019-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | `detailed_metric.vue` was attempting to read the `duration` field even when the metric did not exist in the JSON payload. We now check for the existence of the metrics before attempting to display the value. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/65491
* | | Merge branch 'improve-dag-tests' into 'master'Sean McGivern2019-08-021-2/+3
|\ \ \ | | |/ | |/| | | | | | | Improve test for .with_needs See merge request gitlab-org/gitlab-ce!31411
| * | Improve test for .with_needsKamil Trzciński2019-08-021-2/+3
| | |
* | | Merge branch 'docs/update-end-to-end-style-guide' into 'master'Walmyr2019-08-021-2/+46
|\ \ \ | |/ / |/| | | | | | | | Update end-to-end style guide doc with new guideline See merge request gitlab-org/gitlab-ce!31342
| * | Update e2e style guide with new guidelinedocs/update-end-to-end-style-guideWalmyr Lima2019-08-011-0/+44
| | |
| * | Update sections titles with right headingWalmyr Lima2019-07-311-2/+2
| | |
* | | Merge branch 'fe-cleanup-job-app-spec' into 'master'Fatih Acet2019-08-021-396/+287
|\ \ \ | | | | | | | | | | | | | | | | Clean up job_app_spec See merge request gitlab-org/gitlab-ce!31400
| * | | Clean up job_app_specfe-cleanup-job-app-specPaul Slaughter2019-08-011-396/+287
| | | | | | | | | | | | | | | | | | | | - Remove setTimeout calls - Add helper function to encapsulate setup
* | | | Merge branch '63571-fix-gc-profiler-data-being-wiped' into 'master'Kamil Trzciński2019-08-026-53/+44
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix GC::Profiler metrics fetching See merge request gitlab-org/gitlab-ce!31331
| * | | | Call `GC::Profiler.clear` only in one placeAleksei Lipniagov2019-08-026-53/+44
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, both InfluxSampler and RubySampler were relying on the `GC::Profiler.total_time` data which is the sum over the list of captured GC events. Also, both samplers asynchronously called `GC::Profiler.clear` which led to incorrect metric data because each sampler has the wrong assumption it is the only object who calls `GC::Profiler.clear` and thus could rely on the gathered results between such calls. We should ensure that `GC::Profiler.total_time` is called only in one place making it possible to rely on accumulated data between such wipes. Also, we need to track the amount of profiler reports we lost.
* | | | Merge branch 'fix-bin-web-puma-script-to-consider-rails-env' into 'master'Kamil Trzciński2019-08-022-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Make `bin/web_puma` consider RAILS_ENV See merge request gitlab-org/gitlab-ce!31378
| * | | | Make `bin/web_puma` consider RAILS_ENVfix-bin-web-puma-script-to-consider-rails-envAleksei Lipniagov2019-08-012-1/+6
| | | | |
* | | | | Merge branch 'sh-fix-mermaid-subgraphs-docs' into 'master'test-assingingEvan Read2019-08-024-28/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use Mermaid Markdown for testing guide docs See merge request gitlab-org/gitlab-ce!31322
| * | | | | Use Mermaid Markdown for testing guide docssh-fix-mermaid-subgraphs-docsStan Hu2019-08-014-28/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove PNGs in favor of dynamically rendered graphs * Eliminate <b> styling because this is no longer supported * Change <br /> to <br> because the latter is only supported * Add quotes around subgraph titles
* | | | | | Merge branch 'docs/project-templates-also-on-gitlab-com' into 'master'Achilleas Pipinellis2019-08-021-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Custom project templates also on GitLab.com See merge request gitlab-org/gitlab-ce!31396
| * | | | | | Custom project templates also on GitLab.comEvan Read2019-08-021-2/+2
|/ / / / / /
* | | | | | Merge branch ↵Kushal Pandya2019-08-025-4/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '58256-incorrect-empty-state-message-displayed-on-explore-projects-tab' into 'master' Resolve Incorrect empty state message on "Explore projects" Closes #58256 See merge request gitlab-org/gitlab-ce!25578
| * | | | | | Resolve Incorrect empty state message on "Explore projects"Dennis Tang2019-08-025-4/+11
|/ / / / / /
* | | | | | Merge branch 'georgekoltsov/64501-update-ldap-doc' into 'master'Evan Read2019-08-021-7/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update ldap#security section See merge request gitlab-org/gitlab-ce!31335
| * | | | | | Update ldap#security sectionGeorge Koltsov2019-08-021-7/+10
|/ / / / / /
* | | | | | Merge branch 'compat-check-docs-update' into 'master'Lin Jen-Shin2019-08-027-11/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exclude docs from ee_compat_check See merge request gitlab-org/gitlab-ce!31397
| * | | | | | Update regex for docs branches in ciMarcel Amirault2019-08-027-11/+12
|/ / / / / / | | | | | | | | | | | | | | | | | | Changes * to + to be more precise with acceptable branch names
* | | | | | Merge branch 'sh-mermaid-subgraph-docs' into 'master'Evan Read2019-08-021-0/+43
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document required quotes in Mermaid subgraph titles Closes #65338 See merge request gitlab-org/gitlab-ce!31312
| * | | | | | Document required quotes in Mermaid subgraph titlessh-mermaid-subgraph-docsStan Hu2019-07-311-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mermaid v8.2.3 added support for styling in subgraphs, but if there are multiple words in a title, quotes are required. * https://github.com/knsv/mermaid/pull/845 * https://github.com/knsv/mermaid/issues/391#issuecomment-495602059 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/65338
* | | | | | | Merge branch 'mk/add-rate-limit-docs' into 'master'Evan Read2019-08-028-12/+212
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add rate limit docs Closes #41308 See merge request gitlab-org/gitlab-ce!30829
| * | | | | | Add rate limit docsMichael Kozono2019-08-028-12/+212
|/ / / / / /
* | | | | | Merge branch '59521-job-sidebar-has-a-blank-block' into 'master'Paul Slaughter2019-08-023-5/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove blank block from job sidebar Closes #59521 See merge request gitlab-org/gitlab-ce!30754
| * | | | | | Only render job sidebar block if it has contentMiranda Fluharty2019-08-023-5/+34
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change sidebar's renderBlock() to return true only if any of the block's <detail-row>s will be rendered Change block to render only if renderBlock() returns true
* | | | | | Merge branch 'docs/jira_server_create_user' into 'master'Evan Read2019-08-021-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrected name of Jira group See merge request gitlab-org/gitlab-ce!31358
| * | | | | | Corrected name of Jira groupRussell Dickenson2019-08-021-2/+2
|/ / / / / /
* | | | | | Merge branch 'patch-72' into 'master'Evan Read2019-08-021-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update global dashboard shortcuts See merge request gitlab-org/gitlab-ce!31281
| * | | | | | Update global dashboard shortcutsNishad Sohoni2019-08-021-5/+5
|/ / / / / / | | | | | | | | | | | | | | | | | | Needs shift keypress
* | | | | | Merge branch '10646-create-drafts-with-commit-id-ce' into 'master'Paul Slaughter2019-08-029-8/+81
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14520 See merge request gitlab-org/gitlab-ce!30284
| * | | | | | Backport from EE10646-create-drafts-with-commit-id-cejboyson12019-08-012-0/+4
| | | | | | |
| * | | | | | Make diff_refs_match_commit validation reusablePatrick Bajao2019-08-014-7/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move it to DiffPositionableNote concern which will be re-used in EE in DraftNote model.
| * | | | | | Add commit_id to draft_notes tablePatrick Bajao2019-08-013-1/+13
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14520
* | | | | | Merge branch 'add-cop-for-rspec-file-paths' into 'master'Ash McKenzie2019-08-0219-66/+150
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add RSpec/TopLevelDescribePath cop See merge request gitlab-org/gitlab-ce!31241
| * | | | | | Quarantine folder containing only a folder specadd-cop-for-rspec-file-pathsSean McGivern2019-08-011-1/+2
| | | | | | |
| * | | | | | Remove snippet breadcrumb specSean McGivern2019-08-011-19/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We removed the breadcrumbs in 0def36777e3f9e5f57fd0e1ebd023b43229622fc.
| * | | | | | Fix project nav specsSean McGivern2019-08-011-2/+2
| | | | | | |
View Lorry Controller Status