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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add timezone_name field61864-timezones-with-the-same-identifier-defaults-to-the-first-in-the-list	Małgorzata Ksionek	2019-07-10	7	-1/+32
\| \| \| \|	Add saving timezone_name field
*	Display timezone name not identifier	Ezekiel Kigbo	2019-07-10	2	-4/+6
\|
*	Search for the previously set timezone by name	Ezekiel Kigbo	2019-07-10	2	-20/+40
\|
*	Merge branch 'add-15m-bucket-for-ci-queue' into 'master'	Kamil Trzciński	2019-07-09	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Adds 15m bucket for CI job queue See merge request gitlab-org/gitlab-ce!30525
\| *	Adds 15m bucket for CI job queue	Elliot Rushton	2019-07-09	1	-1/+1
\|/
*	Merge branch 'qa-autodevops-rotate-gcp-zones' into 'master'	Dan Davison	2019-07-09	2	-9/+9
\|\ \| \| \| \| \| \| \| \|	Allow specificity for GKE Cluster Location See merge request gitlab-org/gitlab-ce!30490
\| *	Allow specificity for GKE Cluster Locationqa-autodevops-rotate-gcp-zones	ddavison	2019-07-09	2	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use GCLOUD_REGION over GCLOUD_ZONE. Using REGION over ZONE provides more of a guarantee of cluster size, and dist- ributes between a region's zones
* \|	Merge branch 'patch-72-docs' into 'master'	Thong Kuah	2019-07-09	1	-4/+7
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation for customizing the auto-deploy-app helm chart by setting `HELM_UPGRADE_EXTRA_ARGS` to `--values my-values.yaml` See merge request gitlab-org/gitlab-ce!30371
\| * \|	Apply suggestion to doc/topics/autodevops/index.md	nathanbietz	2019-07-09	1	-1/+0
\| \| \|
\| * \|	Merge branch 'master' into 'patch-72-docs'	nathanbietz	2019-07-09	588	-5323/+7722
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # doc/topics/autodevops/index.md
\| * \| \|	Apply suggestion to doc/topics/autodevops/index.md	nathanbietz	2019-07-09	1	-1/+1
\| \| \| \|
\| * \| \|	Apply suggestion to doc/topics/autodevops/index.md	nathanbietz	2019-07-09	1	-1/+1
\| \| \| \|
\| * \| \|	Apply suggestion to doc/topics/autodevops/index.md	nathanbietz	2019-07-09	1	-1/+1
\| \| \| \|
\| * \| \|	Apply suggestion to doc/topics/autodevops/index.md	nathanbietz	2019-07-09	1	-1/+1
\| \| \| \|
\| * \| \|	Apply suggestion to doc/topics/autodevops/index.md	nathanbietz	2019-07-09	1	-1/+1
\| \| \| \|
\| * \| \|	Update index.md.... change "helm deploy" to "helm upgrade"	nathanbietz	2019-07-04	1	-1/+1
\| \| \| \|
\| * \| \|	Update index.md.... add instructions on how to add a `values.yaml` override ↵	nathanbietz	2019-07-04	1	-4/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	file to the default auto-deploy-app helm chart by setting `HELM_UPGRADE_EXTRA_ARGS` to `--values my-values.yaml` (or `-f my-values.yaml`).
* \| \| \|	Merge branch 'fix-unicorn-sampler-workers-count' into 'master'	Stan Hu	2019-07-09	3	-11/+38
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make unicorn_workers to return meaningful results Closes #63659 See merge request gitlab-org/gitlab-ce!30506
\| * \| \| \|	Make unicorn_workers to return meaningful resultsfix-unicorn-sampler-workers-count	Kamil Trzciński	2019-07-09	3	-11/+38
\| \| \| \| \|
* \| \| \| \|	Merge branch 'project_api' into 'master'	Douglas Barbosa Alexandre	2019-07-09	11	-35/+304
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve Project API Closes #49938, #40892, and #35992 See merge request gitlab-org/gitlab-ce!28327
\| * \ \ \ \	Merge branch 'master' into sathieu/gitlab-ce-project_api	Douglas Barbosa Alexandre	2019-07-09	834	-7310/+11484
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Reduce changes to doc/api/projects.mdproject_api	Nick Thomas	2019-07-04	1	-62/+69
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update json for "Get single project" doc	Mathieu Parent	2019-07-03	1	-69/+62
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix API performance problem of auto_devops query	Mathieu Parent	2019-07-03	1	-0/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add changelog entry	Mathieu Parent	2019-07-03	1	-0/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add auto_devops_* to project API	Mathieu Parent	2019-07-03	6	-2/+67
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The auto_devops object sometimes doesn't exists. We may need to create it.
\| * \| \| \| \| \|	Add auto_cancel_pending_pipelines to project API	Mathieu Parent	2019-07-03	3	-0/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add build_coverage_regex to project API	Mathieu Parent	2019-07-03	3	-0/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add build_timeout to project API	Mathieu Parent	2019-07-03	3	-0/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add build_git_strategy attribute to project API	Mathieu Parent	2019-07-03	7	-0/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We map the boolean to the string 'fetch' or 'clone', to be more explicit.
\| * \| \| \| \| \|	Add *_access_level to project API	Mathieu Parent	2019-07-03	7	-35/+160
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- issues_access_level - repository_access_level - merge_requests_access_level - builds_access_level - wiki_access_level - snippets_access_level
* \| \| \| \| \| \|	Merge branch 'nfriend-add-delay-support-to-tooltip-js' into 'master'	Fatih Acet	2019-07-09	1	-0/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add delay customization to `app/assets/javascripts/vue_shared/directives/tooltip.js` See merge request gitlab-org/gitlab-ce!30524
\| * \| \| \| \| \| \|	Add delay customization to tooltip.jsnfriend-add-delay-support-to-tooltip-js	Nathan Friend	2019-07-09	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This MR allows the delay of tooltips instantiated using tooltip.js to be customized through localStorage.
* \| \| \| \| \| \| \|	Merge branch 'jc-disable-can-use-disk-temp' into 'master'	Stan Hu	2019-07-09	2	-11/+14
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disabling can_use_disk? temporarily See merge request gitlab-org/gitlab-ce!30526
\| * \| \| \| \| \| \| \|	Disabling can_use_disk? temporarily	John Cai	2019-07-09	2	-11/+14
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'osw-bypass-push-rules-for-merge-to-ref' into 'master'	Stan Hu	2019-07-09	5	-17/+42
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE port] Bypass push rules for merge to ref service See merge request gitlab-org/gitlab-ce!30426
\| * \| \| \| \| \| \| \|	[CE port] Bypass push rules for merge to ref serviceosw-bypass-push-rules-for-merge-to-ref	Oswaldo Ferreira	2019-07-09	5	-17/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Turns out push rules to validate commit message does not apply in the context of automatic merge to the refs/merge-requests/:iid/merge. Mainly because if it fails to merge to it, we currently can't give enough preemptive feedback to the user and it'll turn the merge request unmergeable (given we automatically mark it as unmergeable if we can't merge to the ref). In general, it's a systematic operation, which already bypasses user authorization and git hooks. Therefore, this commit makes it bypass the push rules at EE as well.
* \| \| \| \| \| \| \| \|	Merge branch '63945-update-mixin-deep-to-1.3.2' into 'master'	Mike Greiling	2019-07-09	2	-3/+8
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update mixin-deep to 1.3.2 Closes #63945 See merge request gitlab-org/gitlab-ce!30223
\| * \| \| \| \| \| \| \| \|	Update mixin-deep to 1.3.2	Takuya Noguchi	2019-07-01	2	-3/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To address a Prototype Pollution vulnerability, which exists in `mixin-deep` package, versions `>=2.0.0 <2.0.1 \|\| <1.3.2` (CVE-2019-10746). - Diff: https://github.com/jonschlinkert/mixin-deep/compare/1.3.1...1.3.2 - Synk ID: https://app.snyk.io/vuln/SNYK-JS-MIXINDEEP-450212 Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* \| \| \| \| \| \| \| \| \|	Merge branch 'ce-10609-system-notes-scoped-labels' into 'master'	Kamil Trzciński	2019-07-09	2	-7/+18
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port of "Create system notes for scoped labels" See merge request gitlab-org/gitlab-ce!30250
\| * \| \| \| \| \| \| \| \| \|	Update label note to support scoped labels notesce-10609-system-notes-scoped-labels	Jarka Košanová	2019-07-02	2	-7/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- port of EE change
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'update-net-ssh' into 'master'	Robert Speicher	2019-07-09	2	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update net-ssh gem to ~> 5.2 See merge request gitlab-org/gitlab-ce!30341
\| * \| \| \| \| \| \| \| \| \| \|	Update net-ssh gem to ~> 5.2	Pirate Praveen	2019-07-04	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'jramsay/enable-object-dedupe-by-default' into 'master'	Nick Thomas	2019-07-09	3	-13/+13
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable repository object pools by default Closes gitaly#1606 See merge request gitlab-org/gitlab-ce!29595
\| * \| \| \| \| \| \| \| \| \| \| \|	Enable repository object pools by default	James Ramsay	2019-07-09	3	-13/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Object pools allow Git objects to be shared from the parent project to forks, reducing storage requirements.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-redact-redis-perf-bar' into 'master'	Sean McGivern	2019-07-09	2	-2/+42
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Perform more redactions in Redis performance bar traces Closes #64309 See merge request gitlab-org/gitlab-ce!30514
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Perform more redactions in Redis performance bar traces	Stan Hu	2019-07-09	2	-2/+42
\| \| \|_\|_\|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	HMSET and AUTH commands were not properly redacted. This commit does that and adds a test. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64309
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'negative-commit-message-push-rule-docs' into 'master'	Ray Paik	2019-07-09	2	-24/+32
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Negative commit message push rule docs See merge request gitlab-org/gitlab-ce!30521
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Add the changelog entry.	Maikel	2019-07-09	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Document the negative commit message push rule for the API.	Maikel	2019-07-09	1	-24/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \|