summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add non-parallel review-qa-all jobqa-ml-test-review-qa-allMark Lapierre2019-07-291-0/+7
| | | | | So I can an accurate, up-to-date test duration to compare with the parallel tests.
* Merge branch ↵Kushal Pandya2019-07-295-14/+122
|\ | | | | | | | | | | | | | | | | '61787-the-colour-selector-for-broadcast-messages-should-provide-a-few-default-options-with-descriptive-labels-like-red-green-blue' into 'master' Resolve "Add color selector for broadcast messages" Closes #61787 See merge request gitlab-org/gitlab-ce!30988
| * Add default colors for broadcast messages61787-the-colour-selector-for-broadcast-messages-should-provide-a-few-default-options-with-descriptive-labels-like-red-green-blueAmmar Alakkad2019-07-263-14/+62
| |
| * Add color utils with relevant testsAmmar Alakkad2019-07-262-0/+60
| |
* | Merge branch 'add-kub-product-page' into 'master'Evan Read2019-07-291-0/+4
|\ \ | | | | | | | | | | | | Add relevant Kubernetes page See merge request gitlab-org/gitlab-ce!30480
| * | Add relevant Kubernetes pageSarah Daily2019-07-291-0/+4
|/ /
* | Merge branch 'docs-ssot-july-3' into 'master'Evan Read2019-07-293-17/+61
|\ \ | | | | | | | | | | | | Docs: adere ssot See merge request gitlab-org/gitlab-ce!31182
| * | Docs: adere ssotMarcia Ramos2019-07-293-17/+61
|/ /
* | Merge branch 'docs-ssot-july-1' into 'master'Evan Read2019-07-293-26/+69
|\ \ | | | | | | | | | | | | Docs: Pipelines - ssot See merge request gitlab-org/gitlab-ce!31179
| * | Docs: Pipelines - ssotMarcia Ramos2019-07-293-26/+69
|/ /
* | Merge branch 'docs-ssot-july-2' into 'master'Evan Read2019-07-291-0/+16
|\ \ | | | | | | | | | | | | Docs: Releases - ssot See merge request gitlab-org/gitlab-ce!31180
| * | Releases doc - ssotdocs-ssot-july-2Marcia Ramos2019-07-261-0/+16
| | |
* | | Merge branch 'docs-ssot-july' into 'master'Evan Read2019-07-292-2/+34
|\ \ \ | | | | | | | | | | | | | | | | Docs: milestones - ssot See merge request gitlab-org/gitlab-ce!31175
| * | | Milestones docs - ssotdocs-ssot-julyMarcia Ramos2019-07-262-2/+34
| | | |
* | | | Merge branch '52494-remove-unused-cluster-refresh-service' into 'master'Thong Kuah2019-07-296-246/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove unused Clusters::RefreshService See merge request gitlab-org/gitlab-ce!31227
| * | | | Remove unused Clusters::RefreshServiceTiger2019-07-296-246/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | Also removes all logic from ClusterConfigureWorker and ClusterProjectConfigureWorker, which are also no longer used.
* | | | Merge branch 'revert-7dccb444' into 'master'Stan Hu2019-07-279-260/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch '52123-issuable-actions-notesfinder-pderichs' into 'master'" Closes gitlab-ee#13096 See merge request gitlab-org/gitlab-ce!31216
| * | | | Revert "Merge branch '52123-issuable-actions-notesfinder-pderichs' into ↵Stan Hu2019-07-279-260/+24
|/ / / / | | | | | | | | | | | | | | | | 'master'" This reverts merge request !29733
* | | | Merge branch 'qa-fixing-add_batch_comments' into 'master'Dan Davison2019-07-276-7/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | CE backport for changes in EE MR 14746 See merge request gitlab-org/gitlab-ce!30944
| * | | | Adding changes to CE from EETomislav Nikic2019-07-276-7/+19
|/ / / / | | | | | | | | | | | | | | | | All the changes done to files that are also inside CE and need to be ported.
* | | | Merge branch '52123-issuable-actions-notesfinder-pderichs' into 'master'Stan Hu2019-07-269-24/+260
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use NotesFinder to fetch notes in module IssuableActions Closes #52123 See merge request gitlab-org/gitlab-ce!29733
| * | | | Use NotesFinder in module IssuableActionsPatrick Derichs2019-07-269-24/+260
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add spec for concern IssuableActions Add shared samples for discussions endpoint Add schema validations for discussions Fix rubocop style issue Make target assignable Use new possibility to provide target
* | | | | Merge branch 'update-ruby-version-in-readme' into 'master'Mayra Cabrera2019-07-261-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update ruby version in readme file to match .ruby-version See merge request gitlab-org/gitlab-ce!31185
| * | | | | Update ruby version in readme file to match .ruby-versionOsnat Vider2019-07-261-1/+1
|/ / / / /
* | | | | Merge branch '19186-redirect-wiki-git-route-to-wiki' into 'master'Stan Hu2019-07-264-0/+45
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Redirect project.wiki.git to project wiki home See merge request gitlab-org/gitlab-ce!31085
| * | | | | Redirect project.wiki.git to project wiki home19186-redirect-wiki-git-route-to-wikiLuke Duncalfe2019-07-264-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/19186
* | | | | | Merge branch 'tp-fix-borked-master' into 'master'Mayra Cabrera2019-07-261-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix spec that has broken master Closes #65193 See merge request gitlab-org/gitlab-ce!31198
| * | | | | | Changes capybara selector to qa-selectorTanya Pazitny2019-07-261-2/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | Otherwise capybara hits ambiguous match.
* | | | | | Merge branch 'frozen_string_spec_lib' into 'master'Stan Hu2019-07-26395-18/+808
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add frozen_string_literal to spec/lib (part 1) See merge request gitlab-org/gitlab-ce!31130
| * | | | | | Fix cannot modify frozen stringfrozen_string_spec_libThong Kuah2019-07-264-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that Performance/UnfreezeString recommends unary plus over "".dup, but unary plus has lower precedence so we have to use parenthesis
| * | | | | | Add frozen_string_literal to spec/lib (part 1)Thong Kuah2019-07-26395-0/+790
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the sed script from https://gitlab.com/gitlab-org/gitlab-ce/issues/59758
* | | | | | | Merge branch '32495-improve-slack-notification-on-pipeline-status' into 'master'Robert Speicher2019-07-267-104/+671
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make pipeline failure Slack notifications prettier and more informative Closes #32495 See merge request gitlab-org/gitlab-ce!27683
| * | | | | | | Improve pipeline status Slack notifications32495-improve-slack-notification-on-pipeline-statusNathan Friend2019-07-257-104/+671
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds some formatting to the Slack notifications for pipeline statuses, as well as adds information about the stage and jobs that failed in the case of pipeline failure.
* | | | | | | | Merge branch 'rs-resource-label-events-api' into 'master'Lin Jen-Shin2019-07-262-44/+45
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract resource_label_events API shared examples See merge request gitlab-org/gitlab-ce!31156
| * | | | | | | | Simplify resource_label_events API shared examplers-resource-label-events-apiRobert Speicher2019-07-252-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need a repository, and we only need a private user in one example, so we can scope it locally there.
| * | | | | | | | Extract resource_label_events API shared examplesRobert Speicher2019-07-252-42/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow us to reuse them in an EE-only spec.
* | | | | | | | | Merge branch 'qa-refactor-cicd-pages-1' into 'master'Tanya Pazitny2019-07-265-22/+21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor elements used by ci_variable and ::CICD See merge request gitlab-org/gitlab-ce!30922
| * | | | | | | | | Refactor elements used by ci_variable and ::CICDDan Davison2019-07-265-22/+21
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many elements defined in the QA framework in ci_variable.rb call elements and methods that are not framework specific. Fix these issues, as well as use data-qa-selector s
* | | | | | | | | Merge branch 'frozen_string_spec_factories' into 'master'Michael Kozono2019-07-26118-0/+236
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add frozen_string_literal to spec/factories See merge request gitlab-org/gitlab-ce!31129
| * | | | | | | | | Add frozen_string_literal to spec/factoriesfrozen_string_spec_factoriesThong Kuah2019-07-26118-0/+236
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the sed script from https://gitlab.com/gitlab-org/gitlab-ce/issues/59758
* | | | | | | | | Merge branch '59325-units-are-not-shown-on-the-performance-dashboard-2' into ↵65188-this-is-my-test-issue-for-usability-testingMayra Cabrera2019-07-264-29/+47
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' fix: updates labels to include units in metrics Closes #59325 See merge request gitlab-org/gitlab-ce!30330
| * | | | | | | | | Updates label value to include units in metricsLaura Montemayor2019-07-264-29/+47
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR updates the y_label values and the label values in common_metrics and cluster_metrics to append the units of measurement to the labels.
* | | | | | | | | Merge branch '64972-fix-unicorn-workers-metric' into 'master'61080-missing-borders-between-settings-itemsKamil Trzciński2019-07-263-28/+78
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pid discovery for Unicorn in PidProvider See merge request gitlab-org/gitlab-ce!31056
| * | | | | | | | | Fix pid discovery for Unicorn in PidProviderAleksei Lipniagov2019-07-263-28/+78
|/ / / / / / / / /
* | | | | | | | | Merge branch 'remove-nested-groups-checks' into 'master'Lin Jen-Shin2019-07-26125-712/+404
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove code related to object hierarchy and MySQL Closes #65056 and #65055 See merge request gitlab-org/gitlab-ce!31095
| * | | | | | | | | Remove code related to object hierarchy in MySQLremove-nested-groups-checksHeinrich Lee Yu2019-07-25125-712/+404
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are not required because MySQL is not supported anymore
* | | | | | | | | | Merge branch 'mc/feature/find-all-artifacts-for-sha' into 'master'Robert Speicher2019-07-2610-69/+136
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Find build by sha from ref Closes #64534 and #45697 See merge request gitlab-org/gitlab-ce!30843
| * | | | | | | | | | Extract common spec elements to shared_examplesmc/feature/find-all-artifacts-for-shaMatija Čupić2019-07-262-92/+71
| | | | | | | | | | |
| * | | | | | | | | | Rename latest_successful to be more explicitMatija Čupić2019-07-267-28/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Reword Project#latest_successful_build_for to Project#latest_successful_build_for_ref * Reword Ci::Pipeline#latest_successful_for to Ci::Pipeline#latest_successful_build_for_ref
| * | | | | | | | | | Add specs for latest_successful methods for SHAsMatija Čupić2019-07-232-0/+68
| | | | | | | | | | |