summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | 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
|/ / / / / / /
* | | | | | | Merge branch '30355-use-hours-only-for-time-tracking' into 'master'Phil Hughes2019-06-2531-38/+291
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit time tracking units to hours Closes #30355 See merge request gitlab-org/gitlab-ce!29469
| * | | | | | | Rename to time_tracking_limit_to_hours30355-use-hours-only-for-time-trackingHeinrich Lee Yu2019-06-2532-57/+259
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes migration and all other places the attribute is used
| * | | | | | | Limit time tracking values to hoursJon Kolb2019-06-2512-5/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds an instance setting to limit display of time tracking values to hours only
* | | | | | | | Merge branch 'vue-i18n-js-issue-show-directory' into 'master'Phil Hughes2019-06-256-16/+41
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vue-i18n: autofix for app/assets/javascripts/issue_show directory See merge request gitlab-org/gitlab-ce!29968
| * | | | | | | | Vue-i18n: app/assets/javascripts/issue_show directoryEzekiel Kigbo2019-06-256-16/+41
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n linting for .vue files under the app/assets/javascripts/issue_show directory
* | | | | | | | Merge branch 'leipert-upgrade-axios' into 'master'Phil Hughes2019-06-252-20/+20
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Upgrade axios to 0.19.0 See merge request gitlab-org/gitlab-ce!29981
| * | | | | | | Upgrade axios to 0.19.0leipert-upgrade-axiosLukas Eipert2019-06-242-20/+20
| | | | | | | |
* | | | | | | | Merge branch 'vue-i18n-js-monitoring-directory' into 'master'Kushal Pandya2019-06-253-23/+69
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Vue-i18n: autofix for app/assets/javascripts/monitoring directory See merge request gitlab-org/gitlab-ce!29971
| * | | | | | | Vue-i18n: app/assets/javascripts/monitoring directoryvue-i18n-js-monitoring-directoryEzekiel Kigbo2019-06-243-23/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n linting for .vue files under the app/assets/javascripts/monitoring directory
* | | | | | | | Merge branch 'docs/exclude-docs-from-job' into 'master'Achilleas Pipinellis2019-06-251-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exclude docs-only branches from job See merge request gitlab-org/gitlab-ce!30005
| * | | | | | | | Exclude docs-only branches from jobEvan Read2019-06-251-0/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'docs/add-mdl-and-rule-032' into 'master'Achilleas Pipinellis2019-06-2537-193/+220
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Markdown linting and one rule See merge request gitlab-org/gitlab-ce!29970
| * | | | | | | | Add Markdown lintingEvan Read2019-06-2537-193/+220
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds and one linting rule and makes project conform to it.
* | | | | | | | Merge branch 'docs/dep-scanning' into 'master'Evan Read2019-06-252-13/+174
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document all the available options for Dependency Scanning Closes gitlab-ee#10121 See merge request gitlab-org/gitlab-ce!29347
| * | | | | | | | Document all the available options for Dependency Scanningdocs/dep-scanningAchilleas Pipinellis2019-06-242-13/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port all info from: - security-products/dependency-scanning/blob/master/docs/README.md - security-products/dependency-scanning/blob/master/docs/analyzers.md
* | | | | | | | | Merge branch 'doc/container-registry' into 'master'Evan Read2019-06-251-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mention kaniko in container registry See merge request gitlab-org/gitlab-ce!29916
| * | | | | | | | | Mention kaniko in container registryFranklin Yu2019-06-251-0/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch 'patch-68' into 'master'Evan Read2019-06-251-11/+24
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add brackets escape example to LDAP doc See merge request gitlab-org/gitlab-ce!29285
| * | | | | | | | | Add brackets escape example to LDAP docBlair Lunceford2019-06-251-11/+24
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs-blunceford-before-sha-fix' into 'master'Evan Read2019-06-251-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Updated explanation of CI_COMMIT_BEFORE_SHA variable See merge request gitlab-org/gitlab-ce!29913
| * | | | | | | | Updated explanation of CI_COMMIT_BEFORE_SHA variableBlair Lunceford2019-06-251-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'refactor_deployment_cluster' into 'master'Stan Hu2019-06-244-13/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor Deployment#cluster to #deployment_platform_cluster See merge request gitlab-org/gitlab-ce!29961
| * | | | | | | | Rename method to not clash with #clusterrefactor_deployment_clusterThong Kuah2019-06-244-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We will introduce #cluster at a later stage. Also deprecate this method
| * | | | | | | | Move innards of cluster method to environmentThong Kuah2019-06-241-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Environment already has a memoized deployment plaform. No need to check for respond_to?(:cluster) now that all deployment platforms are Clusters::Cluster.
* | | | | | | | | Merge branch 'fix-50834' into 'master'Nick Thomas2019-06-246-14/+29
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change HTTP Status Code when repository disabled Closes #50834 See merge request gitlab-org/gitlab-ce!29585
View Lorry Controller Status