summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Enable Junit reports64756-re-enable-junit-reportsSteve Azzopardi2019-07-192-9/+6
| | | | | | | | | | With https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/30254 Junit reports were disabled. With https://gitlab.com/gitlab-com/gl-infra/production/issues/928 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/30274 solved we should enable them again. closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64756
* Merge branch 'add-metadata-to-epic-list-view-ce' into 'master'Sean McGivern2019-07-191-2/+2
|\ | | | | | | | | Use `issuable_path` helper See merge request gitlab-org/gitlab-ce!30913
| * Use issuable_path to allow support of epicsBrett Walker2019-07-181-2/+2
| |
* | Merge branch '64722-mg-export-frontend-fixtures' into 'master'Phil Hughes2019-07-1968-81/+137
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Export frontend fixtures as pipeline artifact" Closes #64722 and #59166 See merge request gitlab-org/gitlab-ce!30917
| * | Add missing static fixture64722-mg-export-frontend-fixturesMike Greiling2019-07-191-0/+29
| | |
| * | Move frontend fixtures into spec/frontendMike Greiling2019-07-1961-20/+16
| | | | | | | | | | | | | | | Moves every fixture source file from spec/javascripts to spec/frontend
| * | Save fixtures as pipeline artifactsMike Greiling2019-07-191-0/+2
| | |
| * | Move frontend fixtures to tmp/testsMike Greiling2019-07-195-8/+16
| | |
| * | Rename the karma:fixtures taskMike Greiling2019-07-195-15/+32
| | | | | | | | | | | | | | | | | | Introduces frontend:fixtures rake task to replace karma:fixtures and update documentation and CI scripts to match
| * | Backport line changes from EEMike Greiling2019-07-192-1/+4
| | | | | | | | | | | | | | | | | | | | | EE-specific line changes were introduced in the following MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/12680 This change resolves most of them
| * | Don't kill the fixtures directory between testsMike Greiling2019-07-191-1/+1
| | |
| * | Prefer an absolute path over cwd()Mike Greiling2019-07-191-3/+4
| | |
| * | Resolve annoying deprecation warningsMike Greiling2019-07-1826-38/+38
| | | | | | | | | | | | | | | DEPRECATION WARNING: The success? predicate is deprecated and will be removed in Rails 6.0. Please use successful? ...
* | | Merge branch '64784-re-name-regression' into 'master'Kushal Pandya2019-07-192-4/+45
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix regression in re-naming files Closes #64784 See merge request gitlab-org/gitlab-ce!30941
| * | | Fixed regression for re-naming files in WebIDE64784-re-name-regressionDenys Mishunov2019-07-192-4/+45
| | | |
* | | | Merge branch 'bjk/64064_cache_metrics' into 'master'Bob Van Landuyt2019-07-194-4/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Adjust redis cache metrics See merge request gitlab-org/gitlab-ce!30572
| * | | | Adjust redis cache metricsBen Kochie2019-07-194-4/+29
|/ / / / | | | | | | | | | | | | | | | | | | | | * Remove `controller` and `action` labels from duration histogram. * Create a new simple counter for `controller` and `action`. * Adjust histogram buckets to observe smaller response times.
* | | | Merge branch 'qa/better-scope-one-more-test' into 'master'Sanad Liaquat2019-07-191-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Better scope end-to-end test See merge request gitlab-org/gitlab-ce!30897
| * | | | Better scope end-to-end testqa/better-scope-one-more-testWalmyr Lima2019-07-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Move test pre-conditions to before block, and leave only the test steps and verifications in the it block.
* | | | | Merge branch 'qa/better-scope-another-test' into 'master'Sanad Liaquat2019-07-191-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Better scope another end-to-end test See merge request gitlab-org/gitlab-ce!30896
| * | | | | Better scope end-to-end testqa/better-scope-another-testWalmyr Lima2019-07-181-3/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Move test pre-conditions to before block, remove unnecessary expectation, and leave only the test steps and verifications in the it block.
* | | | | Merge branch 'sl-qa-staging-66-quarantine-failing-spec' into 'master'Sanad Liaquat2019-07-191-1/+2
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Quarantine failing "rebase_merge_request_spec.rb" See merge request gitlab-org/gitlab-ce!30933
| * | | | Quarantine failing specsl-qa-staging-66-quarantine-failing-specSanad Liaquat2019-07-191-1/+2
| | | | |
* | | | | Merge branch 'fj-count-web-ide-merge-requests' into 'master'Nick Thomas2019-07-1913-13/+136
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Web IDE Usage Ping for Create SMAU Closes #63886 See merge request gitlab-org/gitlab-ce!30800
| * | | | | Added Usage Data for some Web IDE actionsFrancisco Javier López2019-07-1913-13/+136
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The actions tracked in the web IDE are: - creation of commits - creation of merge requests - projects loaded
* | | | | Merge branch 'qa/better-scode-test' into 'master'Walmyr2019-07-191-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Better scope end-to-end test See merge request gitlab-org/gitlab-ce!30895
| * | | | | Better scope end-to-end testqa/better-scode-testWalmyr Lima2019-07-181-1/+3
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Move test pre-conditions to before block, and leave only the test steps and verifications in the it block.
* | | | | Merge branch '64613-add-note-about-private-profile-in-docs' into 'master'Mike Lewis2019-07-191-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a note about private_profile changes in 12.1 Closes #64613 See merge request gitlab-org/gitlab-ce!30772
| * | | | | Add a note about private_profile changes in 12.1Adam Hegyi2019-07-191-0/+3
|/ / / / /
* | | | | Merge branch 'docs-for-merge-train-parallel-pipelines' into 'master'Marcia Ramos2019-07-193-21/+27
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentations for parallel execution strategy for Merge Trains Closes #63369 See merge request gitlab-org/gitlab-ce!30661
| * | | | | Documentations for parallel execution strategy for Merge TrainsShinya Maeda2019-07-193-21/+27
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a documentation for parallel pipelines on merge trains. Fix typo
* | | | | Merge branch 'add-endswith-to-polyfill' into 'master'Phil Hughes2019-07-191-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add endsWith to polyfill See merge request gitlab-org/gitlab-ce!30920
| * | | | | Add endsWith to polyfillSamantha Ming2019-07-191-0/+1
|/ / / / /
* | | | | Merge branch 'jramsay/metrics-reports-docs' into 'master'Marcia Ramos2019-07-191-0/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Link Metrics Reports from merge request docs See merge request gitlab-org/gitlab-ce!30848
| * | | | | Link Metrics Reports from merge request docsJames Ramsay2019-07-191-0/+11
|/ / / / /
* | | | | Merge branch '64295-predictable-environment-slugs' into 'master'Lin Jen-Shin2019-07-195-71/+103
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use predictable environment slugs See merge request gitlab-org/gitlab-ce!30551
| * | | | | Introduce predictable environment slugs64295-predictable-environment-slugsTiger2019-07-195-71/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an environment slug is predictable given only the environment name, we can use the environment slug earlier in the CI variable evaluation process as we don't have to wait for the environment record itself to be persisted.
* | | | | | Merge branch '10009-ee-board' into 'master'Phil Hughes2019-07-192-1/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for issue boards See merge request gitlab-org/gitlab-ce!30851
| * | | | | | Removes EE differences for issue boardsFilipa Lacerda2019-07-192-1/+23
|/ / / / / /
* | | | | | Merge branch 'docs-add-es-rake-task-blunceford' into 'master'Evan Read2019-07-191-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new ES rake task and troubleshooting step See merge request gitlab-org/gitlab-ce!30681
| * | | | | | Added new ES rake task and troubleshooting stepBlair Lunceford2019-07-191-0/+6
|/ / / / / /
* | | | | | Merge branch 'fix-lint-api-path-in-docs' into 'master'Evan Read2019-07-191-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update lint.md to provide correct path for API call as per #58223 Closes #58223 See merge request gitlab-org/gitlab-ce!25703
| * | | | | | Update lint.md to provide the correct path for the APIElliot Rushton2019-07-181-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'docs/fix_index_typo' into 'master'Evan Read2019-07-191-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate word in Issues feature page See merge request gitlab-org/gitlab-ce!30919
| * | | | | | Remove duplicate word in Issues feature pageRussell Dickenson2019-07-191-1/+1
|/ / / / / /
* | | | | | Merge branch 'docs/dast-analyzers' into 'master'Evan Read2019-07-191-0/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document all the available DAST variables Closes gitlab-ee#10122 See merge request gitlab-org/gitlab-ce!30801
| * | | | | | Document all the available DAST variablesdocs/dast-analyzersAchilleas Pipinellis2019-07-161-0/+22
| | | | | | |
* | | | | | | Merge branch 'docs-gitlab-com-subscription-upgrade' into 'master'Evan Read2019-07-191-0/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs for GitLab.com subscription upgrades See merge request gitlab-org/gitlab-ce!30910
| * | | | | | | Add docs for GitLab.com subscription upgradesOswaldo Ferreira2019-07-191-0/+8
|/ / / / / / /
* | | | | | | Merge branch 'docs-interacting-components-to-reason-about' into 'master'Evan Read2019-07-192-0/+30
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document interacting GitLab components and features See merge request gitlab-org/gitlab-ce!30813
View Lorry Controller Status