summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update Rugged to 0.28.2sh-update-rugged-0.28.2Stan Hu2019-07-261-1/+1
| | | | | This is a bug fix release: https://github.com/libgit2/libgit2/releases
* 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
| | | | | | | |
| * | | | | | | Find build by sha from refMatija Čupić2019-07-234-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds ability to find builds by sha when only specifying a ref.
* | | | | | | | Merge branch 'remove_deployment_metrics_deployment_platform_fallback' into ↵Kamil Trzciński2019-07-264-27/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Remove fallback to deployment_platform_cluster in `DeploymentMetrics` See merge request gitlab-org/gitlab-ce!31126
| * | | | | | | | Removes potentially incorrect, and slow fallbackremove_deployment_metrics_deployment_platform_fallbackThong Kuah2019-07-254-27/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deployment_platform is relatively expensive and calling this after the fact means that this may not be the cluster that was deployed to. Correspondingly reduce the leeway given in the related N+1 spec
* | | | | | | | | Merge branch '12425-filters-for-dependency-scanning-to-dl' into 'master'Kamil Trzciński2019-07-261-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add severity for vulnerabilities See merge request gitlab-org/gitlab-ce!31146
| * | | | | | | | | Add severity for vulnerabilitiesTetiana Chupryna2019-07-261-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge branch 'ce-mw-productivity-analytics-mr-table' into 'master'Fatih Acet2019-07-262-0/+17
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (CE Port) Add MR table component for Productivity Analytics See merge request gitlab-org/gitlab-ce!30975
| * | | | | | | | | (CE Port) Add MR table component for Productivity AnalyticsMartin Wortschack2019-07-262-0/+17
|/ / / / / / / / /
* | | | | | | | | Merge branch 'dm-submodule-links-nil' into 'master'Nick Thomas2019-07-265-3/+75
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error rendering submodules in MR diffs when there is no .gitmodules See merge request gitlab-org/gitlab-ce!31162
| * | | | | | | | | Fix error rendering submodules in MR diffs when there is no .gitmodulesdm-submodule-links-nilDouwe Maan2019-07-265-3/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this change, we get a NoMethodError on nil
* | | | | | | | | | Merge branch 'pl-flat_map-ce' into 'master'Lin Jen-Shin2019-07-269-16/+14
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prefer `flat_map` over `map` + `flatten` See merge request gitlab-org/gitlab-ce!31144
| * | | | | | | | | | Prefer `flat_map` over `map` + `flatten`Peter Leitzen2019-07-269-16/+14
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert several occurrences of `map` + `flatten` to `flat_map` where applicable.
* | | | | | | | | | Merge branch 'docs-label-filtering' into 'master'Sean McGivern2019-07-262-0/+170
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add development documentation on label filtering Closes #49651 See merge request gitlab-org/gitlab-ce!30741
| * | | | | | | | | | Add development documentation on label filteringdocs-label-filteringSean McGivern2019-07-252-0/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This topic comes up periodically, and we've investigated several options for changing the way we filter labels. Unfortunately, we have yet to find an option that is strictly better than the current state.
* | | | | | | | | | | Merge branch 'renovate/gitlab-ui-5.x' into 'master'Fatih Acet2019-07-2612-20/+22
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/ui to ^5.9.0 See merge request gitlab-org/gitlab-ce!31153
| * | | | | | | | | | | Karma: Fix css selector for loading iconLukas 'Eipi' Eipert2019-07-2612-20/+22
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GitLab UI update changed the spinner selector from `spinner` to `gl-spinner`, so we need to update it, so that our tests won't fail.
* | | | | | | | | | | Merge branch 'extract_auto_deploy_into_base_image' into 'master'Dmitriy Zaporozhets2019-07-263-376/+53
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract Auto DevOps deploy functions in a base image Closes #50286 See merge request gitlab-org/gitlab-ce!30404
| * | | | | | | | | | | Extract deploy functions in a base imageextract_auto_deploy_into_base_imageThong Kuah2019-07-253-376/+53
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/cluster-integration/auto-deploy-image