delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add endpoint for fetching diverging commit countsid-stale-branches	Igor Drozdov	2019-06-28	11	-93/+175
\| \| \| \|	Extract diverging_commit_counts into a service class
*	Merge branch '60860-keep-empty-folders-in-tree' into 'master'	Kushal Pandya	2019-06-25	3	-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 list	Denys Mishunov	2019-06-25	3	-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-Shin	2019-06-25	1	-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-project	Rémy Coutable	2019-06-19	1	-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ński	2019-06-25	2	-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-0	Tomasz Maczukin	2019-06-24	2	-1/+6
\| \| \|
* \| \|	Merge branch 'mh/colon-autocomplete' into 'master'	Kushal Pandya	2019-06-25	4	-5/+97
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow autocompleting labels using colons and spaces Closes #63343 and #56510 See merge request gitlab-org/gitlab-ce!29749
\| * \| \|	Allow autocompleting scoped labels	Martin Hanzel	2019-06-25	4	-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ński	2019-06-25	5	-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-report	Qingyu Zhao	2019-06-21	5	-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 Thomas	2019-06-25	9	-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-flag	Vladimir Shushlin	2019-06-25	9	-61/+101
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also add ::Gitlab::LetsEncrypt.enabled? shortcut and simplify it a lot
* \| \| \| \|	Merge branch 'in-transaction' into 'master'	Rémy Coutable	2019-06-25	3	-16/+18
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor AfterCommitQueue.inside_transaction? See merge request gitlab-org/gitlab-ce!29903
\| * \| \| \| \|	Refactor inside_transaction? to Gitlab::Database	Andrew Newdigate	2019-06-25	3	-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 Coutable	2019-06-25	3	-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 cache	Philippe Lafoucrière	2019-06-25	3	-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 Pipinellis	2019-06-25	1	-2/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Edit resource creation text Closes #63643 See merge request gitlab-org/gitlab-ce!30006
\| * \| \| \|	Edit resource creation text	Evan Read	2019-06-25	1	-2/+5
\|/ / / /
* \| \| \|	Merge branch '30355-use-hours-only-for-time-tracking' into 'master'	Phil Hughes	2019-06-25	31	-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-tracking	Heinrich Lee Yu	2019-06-25	32	-57/+259
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes migration and all other places the attribute is used
\| * \| \| \|	Limit time tracking values to hours	Jon Kolb	2019-06-25	12	-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 Hughes	2019-06-25	6	-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 directory	Ezekiel Kigbo	2019-06-25	6	-16/+41
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	i18n linting for .vue files under the app/assets/javascripts/issue_show directory
* \| \| \| \|	Merge branch 'leipert-upgrade-axios' into 'master'	Phil Hughes	2019-06-25	2	-20/+20
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade axios to 0.19.0 See merge request gitlab-org/gitlab-ce!29981
\| * \| \| \| \|	Upgrade axios to 0.19.0leipert-upgrade-axios	Lukas Eipert	2019-06-24	2	-20/+20
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'vue-i18n-js-monitoring-directory' into 'master'	Kushal Pandya	2019-06-25	3	-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-directory	Ezekiel Kigbo	2019-06-24	3	-23/+69
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	i18n linting for .vue files under the app/assets/javascripts/monitoring directory
* \| \| \| \| \| \|	Merge branch 'docs/exclude-docs-from-job' into 'master'	Achilleas Pipinellis	2019-06-25	1	-0/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Exclude docs-only branches from job See merge request gitlab-org/gitlab-ce!30005
\| * \| \| \| \| \| \|	Exclude docs-only branches from job	Evan Read	2019-06-25	1	-0/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'docs/add-mdl-and-rule-032' into 'master'	Achilleas Pipinellis	2019-06-25	37	-193/+220
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Markdown linting and one rule See merge request gitlab-org/gitlab-ce!29970
\| * \| \| \| \| \| \|	Add Markdown linting	Evan Read	2019-06-25	37	-193/+220
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also adds and one linting rule and makes project conform to it.
* \| \| \| \| \| \|	Merge branch 'docs/dep-scanning' into 'master'	Evan Read	2019-06-25	2	-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-scanning	Achilleas Pipinellis	2019-06-24	2	-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 Read	2019-06-25	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mention kaniko in container registry See merge request gitlab-org/gitlab-ce!29916
\| * \| \| \| \| \| \| \|	Mention kaniko in container registry	Franklin Yu	2019-06-25	1	-0/+1
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'patch-68' into 'master'	Evan Read	2019-06-25	1	-11/+24
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add brackets escape example to LDAP doc See merge request gitlab-org/gitlab-ce!29285
\| * \| \| \| \| \| \| \|	Add brackets escape example to LDAP doc	Blair Lunceford	2019-06-25	1	-11/+24
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'docs-blunceford-before-sha-fix' into 'master'	Evan Read	2019-06-25	1	-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 variable	Blair Lunceford	2019-06-25	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'refactor_deployment_cluster' into 'master'	Stan Hu	2019-06-24	4	-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_cluster	Thong Kuah	2019-06-24	4	-8/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We will introduce #cluster at a later stage. Also deprecate this method
\| * \| \| \| \| \| \|	Move innards of cluster method to environment	Thong Kuah	2019-06-24	1	-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 Thomas	2019-06-24	6	-14/+29
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change HTTP Status Code when repository disabled Closes #50834 See merge request gitlab-org/gitlab-ce!29585
\| * \| \| \| \| \| \| \|	Change HTTP Status Code when repository disabled	Sam Battalio	2019-06-24	6	-14/+29
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Update CHANGELOG.md for 12.0.1	GitLab Release Tools Bot	2019-06-24	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge branch 'pages-domains-certificates-auto-renew-mysql' into 'master'	Nick Thomas	2019-06-24	12	-0/+193
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Renew pages domain's certificates through Let's Encrypt See merge request gitlab-org/gitlab-ce!29363
\| * \| \| \| \| \| \| \|	Renew Let's Encrypt certificates	Vladimir Shushlin	2019-06-24	12	-0/+193
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add index for pages domain ssl auto renewal Add PagesDomain.needs_ssl_renewal scope Add cron worker for ssl renewal Add worker for ssl renewal Add pages ssl renewal worker queues settings
* \| \| \| \| \| \| \|	Merge branch '62722-move-derailed-benchmarks-to-global-gem-section' into ↵12-1-auto-deploy-0011285	Kamil Trzciński	2019-06-24	1	-1/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Move `derailed_benchmarks` gem to :default group See merge request gitlab-org/gitlab-ce!29975
\| * \| \| \| \| \| \| \|	Move `derailed_benchmarks` gem to default group62722-move-derailed-benchmarks-to-global-gem-section	Aleksei Lipniagov	2019-06-24	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Some benchmarks of the gem require booting the app in `production` environment.