summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add tier badge for additional pipelines quota purchase61687-follow-up-from-update-ci-minutes-docs-to-reflect-this-is-available-to-all-plans-docsAchilleas Pipinellis2019-06-262-7/+5
|
* Merge branch '60697-docs-feedback-revise-operations-dashboard-docs' into ↵Marcia Ramos2019-06-251-7/+4
|\ | | | | | | | | | | | | | | | | 'master' Resolve "Docs feedback: revise operations dashboard" Closes #60697 See merge request gitlab-org/gitlab-ce!30038
| * Clarify permissions for Operations dashboardAchilleas Pipinellis2019-06-251-7/+4
| |
* | Merge branch 'docs/add-code-comments-development-guide' into 'master'Marcia Ramos2019-06-252-0/+15
|\ \ | | | | | | | | | | | | | | | | | | Add code comments development guide Closes #63132 See merge request gitlab-org/gitlab-ce!30043
| * | Add code comments development guideDmitriy Zaporozhets2019-06-252-0/+15
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'ce-mw-onboarding-tour-project-creation' into 'master'Filipa Lacerda2019-06-251-2/+2
|\ \ \ | | | | | | | | | | | | | | | | (CE Port) Set project path on localStorage during onboarding See merge request gitlab-org/gitlab-ce!29989
| * | | (CE Port) Set project path on localStorage during onboardingMartin Wortschack2019-06-251-2/+2
|/ / /
* | | Merge branch ↵Filipa Lacerda2019-06-257-15/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '63177-follow-up-from-use-scoped-routes-for-labels-and-milestones' into 'master' Resolve "Follow-up from "Use scoped routes for labels and milestones"" Closes #63177 See merge request gitlab-org/gitlab-ce!29983
| * | | Remove baseEndpoint from search dropdwon63177-follow-up-from-use-scoped-routes-for-labels-and-milestonesDmitriy Zaporozhets2019-06-247-15/+15
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch ↵Grzegorz Bizon2019-06-254-3/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'require-pipeline-when-enabling-only-allow-merge-if-pipeline-succeeds' into 'master' Pipeline must be present if "Pipeline must succeed" is set See merge request gitlab-org/gitlab-ce!29926
| * | | | Use actual_head_pipeline to enforce presenceFabio Pitino2019-06-251-2/+2
| | | | |
| * | | | Require pipeline if "Pipeline must succeed" is setrequire-pipeline-when-enabling-only-allow-merge-if-pipeline-succeedsFabio Pitino2019-06-254-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a user sets only_allow_merge_if_pipeline_succeeds, also named as "Pipeline must succeed" project setting, we require the pipeline to be present. This solves race condition issues especially with external CI providers when a build is triggered externally but no pipelines are created in GitLab yet. Document that a head pipeline is expected when using "Pipeline must succeed" setting. Also explain limitations with the use of only/except where there may not be any jobs created and the merge request will not be allowed to be merged.
* | | | | Merge branch '63225-move-vuex-action-helper-to-jest' into 'master'Filipa Lacerda2019-06-252-5/+168
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Move vuex action helper spec to Jest See merge request gitlab-org/gitlab-ce!29653
| * | | | | Move Vuex action helper spec to JestMark Florian2019-06-252-5/+168
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is largely a straight-forward copy of the Karma spec, with the usual Karma->Jest necessary changes. This also fixes a bug in the implementation that was causing the tests to fail, when run on Jest/node, whereby actions that return rejected promises would always fail the given test. This was due to those rejections not being caught in the same call stack in which they were created.
* | | | | Merge branch 'winh-this-jest-docs' into 'master'Marcia Ramos2019-06-251-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify that this.something is not available in Jest (docs) Closes #24809 See merge request gitlab-org/gitlab-ce!29887
| * | | | | Clarify that this.something is not available in Jest (docs)Winnie Hellmann2019-06-251-0/+3
|/ / / / /
* | | | | Merge branch 'winh-jest-webpack-docs' into 'master'Marcia Ramos2019-06-251-0/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Clarify that Jest does not use Webpack (docs) See merge request gitlab-org/gitlab-ce!30000
| * | | | Clarify that Jest does not use Webpack (docs)Winnie Hellmann2019-06-251-0/+2
|/ / / /
* | | | Merge branch 'gitaly-version-v1.49.0' into 'master'Bob Van Landuyt2019-06-254-15/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Gitaly to v1.49.0 Closes gitaly#1738 See merge request gitlab-org/gitlab-ce!29990
| * | | | Fix broken worktree testGitalyBot2019-06-254-15/+15
|/ / / / | | | | | | | | | | | | | | | | The setup was wrong, and due to Gitaly being a bit more strict it had to match up. The test is now accurate and passing again.
* | | | Merge branch 'sh-quiet-backup-secrets-log' into 'master'Rémy Coutable2019-06-252-2/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Silence backup warnings when CRON=1 in use Closes #63703 See merge request gitlab-org/gitlab-ce!30033
| * | | | Silence backup warnings when CRON=1 in useStan Hu2019-06-252-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If CRON=1 is in use, we shouldn't generate any output or admins may be notified via e-mail about unnecessary warnings. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63703
* | | | | Merge branch 'docs/dep-scanning-not-support-list' into 'master'Achilleas Pipinellis2019-06-251-7/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Mention what tools are not supported in Dependency Scanning See merge request gitlab-org/gitlab-ce!30030
| * | | | | Mention what tools are not supported in Dependency Scanningdocs/dep-scanning-not-support-listAchilleas Pipinellis2019-06-251-7/+10
| | | | | |
* | | | | | Merge branch '11586-make-create-an-issue-default-for-incident-management-ce' ↵Andreas Brandl2019-06-253-4/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' CE backport: Resolve "Make "Create an issue" default for Incident Management" See merge request gitlab-org/gitlab-ce!29747
| * | | | | | Revert "Revert to `id: :integer`"Peter Leitzen2019-06-253-4/+23
|/ / / / / / | | | | | | | | | | | | | | | | | | This reverts commit 51340f9b47e8339cdabce11d0a17ac724278bff0.
* | | | | | Merge branch 'sh-recover-ee-schema-backport-migration-failure' into 'master'Rémy Coutable2019-06-253-0/+94
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent EE backport migrations from running if CE is not migrated Closes #63612 See merge request gitlab-org/gitlab-ce!30002
| * | | | | | Prevent EE backport migrations from running if CE is not migratedsh-recover-ee-schema-backport-migration-failureStan Hu2019-06-253-0/+94
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a user upgraded to any GitLab 11.x EE version but switched back to CE, it's possible the state of the EE tables are not in the right state for the EE backport migration to work properly. In particular, there were three tables that had trouble: * epics * geo_event_log * vulnerability_feedback The EE backport migration would fail while trying to add foreign key constraints because a key didn't exist in the table. This happens because any EE migration that add or removed columns between v11.0.0 and v11.11.3 are not guaranteed to be applied in an CE installation. The EE backport schema does not individually backport these migrations. We now check if certain columns are present to determine whether the backport migration is in the proper state. CE users are required to upgrade to v11.11.3 EE if they ever installed EE previously before they can go back to v12.x CE. Tested via: ``` git checkout -f v11.0.0-ee bundle exec rake db:reset git checkout .; git checkout -f v11.11.3 bundle exec rake db:migrate git checkout .; git checkout -f v12.0.0 bundle exec rake db:migrate <failure happens> ```
* | | | | | Merge branch 'improve-review-apps-cleanup-when-previous-deployment-failed' ↵Lin Jen-Shin2019-06-252-52/+67
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Improve Review Apps cleanup when previous deployment failed by only issuing an `helm delete` command Closes #63639 and #62161 See merge request gitlab-org/gitlab-ce!28661
| * | | | | | Install Helm on dedicated nodesimprove-review-apps-cleanup-when-previous-deployment-failedRémy Coutable2019-06-251-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Let Helm handle the cleanup and print logs when deployment failsRémy Coutable2019-06-252-51/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Retry review-deploy and review-qa-* jobs twiceRémy Coutable2019-06-251-0/+2
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch '60860-keep-empty-folders-in-tree' into 'master'Kushal Pandya2019-06-253-4/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep empty folders in the tree list Closes #60860 See merge request gitlab-org/gitlab-ce!29196
| * | | | | | Keep empty folders in the tree listDenys Mishunov2019-06-253-4/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When removing the last file from a folder in WebIDE, do not remove the folder from the view. We keep those to give users possibility to re-upload files to the same folders. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60860
* | | | | | | Merge branch ↵Lin Jen-Shin2019-06-251-1/+8
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '62735-for-stable-branches-build-cng-images-from-corresponding-stable-branches-in-cng-mirror-project' into 'master' Pass branch name to the CNG pipeline for stable branches See merge request gitlab-org/gitlab-ce!29617
| * | | | | | Pass branch name to the CNG pipeline for stable branches62735-for-stable-branches-build-cng-images-from-corresponding-stable-branches-in-cng-mirror-projectRémy Coutable2019-06-191-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'update-gitlab-runner-helm-chart-to-0-6-0' into 'master'Kamil Trzciński2019-06-252-1/+6
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Update GitLab Runner Helm Chart to 0.6.0/12.0.0 See merge request gitlab-org/gitlab-ce!29982
| * | | | | | Update GitLab Runner Helm Chart to 0.6.0update-gitlab-runner-helm-chart-to-0-6-0Tomasz Maczukin2019-06-242-1/+6
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'mh/colon-autocomplete' into 'master'Kushal Pandya2019-06-254-5/+97
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow autocompleting labels using colons and spaces Closes #63343 and #56510 See merge request gitlab-org/gitlab-ce!29749
| * | | | | | Allow autocompleting scoped labelsMartin Hanzel2019-06-254-5/+97
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | The `:` key will no longer exit out of the autocomplete dialog, allowing auto-completion of labels with colons in them.
* | | | | | Merge branch '62722-add-gem-size-data-to-metrics-report' into 'master'Kamil Trzciński2019-06-255-53/+54
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add gem size information to metrics.txt in memory CI artifacts See merge request gitlab-org/gitlab-ce!29827
| * | | | | | Generate gem size metrics in memory CI62722-add-gem-size-data-to-metrics-reportQingyu Zhao2019-06-215-53/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes several changes: - Rename memory-static to generate-gems-size-metrics-static - Rename memory-static-objects to generate-gems-memory-metrics-static - Change generate-gems-size-metrics-static interface. The script now expect `bundle exec derailed bundle:mem` output as its input. The script output to stdout, or stderr for error message. - Change generate-gems-memory-metrics-static interface. The script now expect `bundle exec derailed bundle:objects` output as its input. The script output to stdout, or stderr for error message. - Generate gem size metrics. Script generate-gems-size-metrics-static extract each gem size from `bundle exec derailed bundle:mem` output. Save output to metrics file in format: 'gem_size_mb{name="zip"} 0.5'
* | | | | | | Merge branch 'pages-ssl-project-aware-feature-flag' into 'master'Nick Thomas2019-06-259-61/+101
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use project depended feature flag for pages ssl and get certificates only for enabled domains See merge request gitlab-org/gitlab-ce!29609
| * | | | | | | Use project depended feature flag for pages sslpages-ssl-project-aware-feature-flagVladimir Shushlin2019-06-259-61/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add ::Gitlab::LetsEncrypt.enabled? shortcut and simplify it a lot
* | | | | | | | Merge branch 'in-transaction' into 'master'Rémy Coutable2019-06-253-16/+18
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Refactor AfterCommitQueue.inside_transaction? See merge request gitlab-org/gitlab-ce!29903
| * | | | | | | Refactor inside_transaction? to Gitlab::DatabaseAndrew Newdigate2019-06-253-16/+18
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a small change to move AfterCommitQueue.inside_transaction? to Gitlab::Database.inside_transaction? Since this change is required by different changes which may not arrive in sequence, it's easier to extract this change out on it's own.
* | | | | | | Merge branch 'fix-cache-issue-in-secure-job' into 'master'Rémy Coutable2019-06-253-82/+25
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix reports jobs timing out because of cache Closes gitlab-ee#12021, #60879, and gitlab-ee#11303 See merge request gitlab-org/gitlab-ce!29780
| * | | | | | Fix reports jobs timing out because of cachePhilippe Lafoucrière2019-06-253-82/+25
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: This commit relies on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/26801 which brings support to multiple extends. While `cache: {}` can disable a cache being set globally, it doesn't work with extends, which will perform a reverse deep merge based on the keys. The cache defined in the base `.default-cache` job won't be disabled in the report jobs. As a side effect, the `code_quality`, `sast`, and `dependency_scanning` jobs are running on a larger code base than expected, leading to timeouts. fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/11303 fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/60879 fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/12021
* | | | | | Merge branch 'docs/add-edit-jit-creation-text' into 'master'Achilleas Pipinellis2019-06-251-2/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edit resource creation text Closes #63643 See merge request gitlab-org/gitlab-ce!30006
| * | | | | | Edit resource creation textEvan Read2019-06-251-2/+5
|/ / / / / /