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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix error rendering submodules in MR diffs when there is no .gitmodulesdm-submodule-links-nil	Douwe Maan	2019-07-26	5	-3/+75
\| \| \| \|	Without this change, we get a NoMethodError on nil
*	Merge branch 'outbound_local_requests_whitelist_nil' into 'master'	Mayra Cabrera	2019-07-25	3	-2/+53
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix outbound_local_requests_whitelist nil for existing ApplicationSetting records Closes #65096 See merge request gitlab-org/gitlab-ce!31123
\| *	Add default for outbound_local_requests_whitelist	Thong Kuah	2019-07-25	3	-2/+53
\|/ \| \| \|	It needs to default to an empty array logically.
*	Merge branch 'pl-label-incident-issues-docs' into 'master'	Douglas Barbosa Alexandre	2019-07-25	1	-0/+2
\|\ \| \| \| \| \| \| \| \|	Add doc about incident issue labels See merge request gitlab-org/gitlab-ce!31107
\| *	Add doc about incident issue labels	Peter Leitzen	2019-07-25	1	-0/+2
\|/
*	Merge branch 'je-separate-namespace-fe' into 'master'	Mike Greiling	2019-07-25	9	-8/+137
\|\ \| \| \| \| \| \| \| \|	Add namespace label toggle See merge request gitlab-org/gitlab-ce!30935
\| *	Update namespace label text for managed clusters	Jacques Erasmus	2019-07-25	9	-8/+137
\|/ \| \| \|	Added the ability to update the namespace label text for gitlab-managed
*	Merge branch 'frozen_string_spec_support' into 'master'	Douwe Maan	2019-07-25	251	-9/+508
\|\ \| \| \| \| \| \| \| \|	Add frozen_string_literal to spec/support See merge request gitlab-org/gitlab-ce!31132
\| *	Frozen string cannot change encodingfrozen_string_spec_support	Thong Kuah	2019-07-26	3	-4/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was shown in specs but surely this will be happening in application code as well if this method is passes a frozen string. We were also trying to force_encode a OmniAuth::AuthHash which had the very confusing behaviour of returning nil when it was sent a method that it did not define. Fix that by only force_encoding a String.
\| *	Fix frozen string error	Thong Kuah	2019-07-25	2	-5/+6
\| \|
\| *	Add frozen_string_literal to spec/support	Thong Kuah	2019-07-25	247	-0/+494
\| \| \| \| \| \| \| \| \| \|	Using the sed script from https://gitlab.com/gitlab-org/gitlab-ce/issues/59758
* \|	Merge branch 'log-system-unicornstderr-typofix-docs' into 'master'	Stan Hu	2019-07-25	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Remove \ from unicorn\_stderr.log See merge request gitlab-org/gitlab-ce!31159
\| * \|	Remove \ from unicorn\_stderr.log	Greg Myers	2019-07-25	1	-1/+1
\|/ /
* \|	Merge branch 'label-descr-push-opts' into 'master'	Lin Jen-Shin	2019-07-25	5	-10/+194
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Support title and desc on merge w/ push option See merge request gitlab-org/gitlab-ce!31068
\| * \|	Support title and desc on merge w/ push optionlabel-descr-push-opts	Christian Couder	2019-07-24	5	-10/+194
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MergeRequests::PushOptionsHandlerService has been updated to allow creating and updating merge requests with the `title` and `description` set using git push options. To create a new merge request and set its title and description: git push -u origin -o merge_request.create \ -o merge_request.title="My title" \ -o merge_request.description="My description" To update an existing merge request and set its title and description: git push -u origin -o merge_request.title="My title" \ -o merge_request.description="My description" Issue https://gitlab.com/gitlab-org/gitlab-ce/issues/64320
* \| \|	Merge branch '54478-table_exists-not-compatible-with-rails-5-1' into 'master'	Douglas Barbosa Alexandre	2019-07-25	7	-19/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "table_exists? not compatible with Rails 5.1" Closes #54478 See merge request gitlab-org/gitlab-ce!30832
\| * \| \|	Remove unneeded monkey-patch54478-table_exists-not-compatible-with-rails-5-1	Heinrich Lee Yu	2019-07-25	7	-19/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes all calls to data_source_exists? to table_exists? since that is the intent of these calls
* \| \| \|	Merge branch 'remove-duplicate-ado-content' into 'master'	Marcia Ramos	2019-07-25	1	-4/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove duplicate content about auto-devops customization See merge request gitlab-org/gitlab-ce!30929
\| * \| \| \|	Remove duplicate content about auto-devops customizationremove-duplicate-ado-content	Kenny Johnston	2019-07-19	1	-4/+0
\| \| \| \| \|
* \| \| \| \|	Merge branch 'docs-single-codebase-details' into 'master'	Marcia Ramos	2019-07-25	1	-33/+10
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update guidance for EE doc submissions See merge request gitlab-org/gitlab-ce!31042
\| * \| \| \| \|	Update guidance for EE doc submissions	Marcel Amirault	2019-07-25	1	-33/+10
\|/ / / / /
* \| \| \| \|	Merge branch 'docs/add-caution-to-gitlab-university' into 'master'	Marcia Ramos	2019-07-25	1	-0/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Note GitLab University may be out of date in parts See merge request gitlab-org/gitlab-ce!31034
\| * \| \| \| \|	Note GitLab University may be out of date in parts	Evan Read	2019-07-25	1	-0/+4
\|/ / / / /
* \| \| \| \|	Merge branch 'docs/update-container-registry' into 'master'	Marcia Ramos	2019-07-25	2	-35/+36
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update documentation for current state Closes #64710 See merge request gitlab-org/gitlab-ce!30873
\| * \| \| \| \|	Update documentation for current state	Evan Read	2019-07-25	2	-35/+36
\|/ / / / /
* \| \| \| \|	Merge branch ↵	Nick Thomas	2019-07-25	1	-2/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'qa-stop-printing-dots-while-retrieving-pod-names-in-review-deploy' into 'master' Stop printing dots while retrieving pod in review-apps.sh See merge request gitlab-org/gitlab-ce!31062
\| * \| \| \| \|	Stop printing dots while retrieving pod in review-apps.shqa-stop-printing-dots-while-retrieving-pod-names-in-review-deploy	Rémy Coutable	2019-07-23	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'docs/improve-commit-email-steps' into 'master'	Marcia Ramos	2019-07-25	1	-15/+16
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve steps for setting commit email Closes #54881 See merge request gitlab-org/gitlab-ce!30833
\| * \| \| \| \| \|	Improve steps for setting commit email	Evan Read	2019-07-25	1	-15/+16
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'docs/ssot-phase-two' into 'master'	Marcia Ramos	2019-07-25	10	-24/+187
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refine topics for Phase 2 of SSoT audit Closes #64682 See merge request gitlab-org/gitlab-ce!30831
\| * \| \| \| \| \|	Refine topics for Phase 2 of SSoT audit	Evan Read	2019-07-25	10	-24/+187
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Includes admin_area and application_security topics.
* \| \| \| \| \|	Merge branch 'docs/add-structure-to-cluster-topic' into 'master'	Marcia Ramos	2019-07-25	8	-209/+225
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restructure project cluster topic See merge request gitlab-org/gitlab-ce!31081
\| * \| \| \| \| \|	Restructure project cluster topic	Evan Read	2019-07-25	8	-209/+225
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also fixes links to section headings that have changed.
* \| \| \| \| \|	Merge branch '64194-update-code-review-docs-with-examples' into 'master'	Marcia Ramos	2019-07-25	1	-0/+25
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a section of examples to code review docs Closes #64194 See merge request gitlab-org/gitlab-ce!30825
\| * \| \| \| \| \|	Add a section of examples	Kerri Miller	2019-07-25	1	-0/+25
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We have a fairly good guide to Code Reviews, but can be improved by adding a few examples of what a good code review looks like at GitLab, specifically ones where there is a bit of back and forth, "nit-picking," etc. This would: + help set expectations of newly hired engineers around what our process looks like when it is functioning what level of scrutiny their code will be under + how we have technical conversations + show by example how after you're done crafting a solution, there can still be extra work done either tidying up code and/or managing the communication and conversations about your proposed MR
* \| \| \| \| \|	Merge branch 'docs-fix-typo-dependencies' into 'master'	Marcia Ramos	2019-07-25	1	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in param name See merge request gitlab-org/gitlab-ce!31100
\| * \| \| \| \| \|	Fix typo in param name	Tetiana Chupryna	2019-07-25	1	-2/+2
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'docs-nfriend-project-name-vs-project-path' into 'master'	Marcia Ramos	2019-07-25	1	-1/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify difference between project name and project path for API usage See merge request gitlab-org/gitlab-ce!31019
\| * \| \| \| \| \|	Clarify project name vs pathdocs-nfriend-project-name-vs-project-path	Nathan Friend	2019-07-22	1	-1/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'sh-support-docker-oci-images' into 'master'	Dmitriy Zaporozhets	2019-07-25	5	-5/+49
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support Docker OCI images Closes gitlab-ee#12877 and #58685 See merge request gitlab-org/gitlab-ce!31127
\| * \| \| \| \| \| \|	Support Docker OCI imagessh-support-docker-oci-images	Stan Hu	2019-07-25	5	-5/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docker Distribution v2.7.0 shipped with OCI support, but our container registry client was not updated to handle the manifest format in the HTTP `Accept` header. As a result, API calls to retrieve a manifest would return with an error, "OCI manifest found, but accept header does not support OCI manifests". This would result in blank fields in the container registry page and prevent tags from being deleted. To fix this, we just need to add `application/vnd.oci.image.manifest.v1+json` to the `Accept` header and configure Faraday to parse the response as JSON. The response structure is the same as the standard Docker Distribution V2 manifest. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58685 Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/12877
* \| \| \| \| \| \| \|	Merge branch '63457-additional-vue-autofixes' into 'master'	Phil Hughes	2019-07-25	4	-15/+59
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Vue-i18n: Autofix additional i18n lints for vue files See merge request gitlab-org/gitlab-ce!31125
\| * \| \| \| \| \| \| \|	Autofix i18n lints for vue files	Ezekiel Kigbo	2019-07-25	4	-15/+59
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Autofixes additional linting errors found in vue files.
* \| \| \| \| \| \| \|	Merge branch 'refactor-redis-usage-counter-specs' into 'master'	Nick Thomas	2019-07-25	2	-64/+66
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor usage data counters specs See merge request gitlab-org/gitlab-ce!31013
\| * \| \| \| \| \| \| \|	Refactor usage data counters specsrefactor-redis-usage-counter-specs	Alex Kalderimis	2019-07-22	2	-64/+66
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes these tests available for other implementations
* \| \| \| \| \| \| \| \|	Merge branch '9643-jira-api-serializer-ce' into 'master'	Sean McGivern	2019-07-25	2	-1/+7
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE] Create serializer for Jira API JSON payload See merge request gitlab-org/gitlab-ce!31139
\| * \| \| \| \| \| \| \| \|	Backport Jira issue key regex	Heinrich Lee Yu	2019-07-25	2	-1/+7
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'tc-revert-rails5-workaround' into 'master'	Andreas Brandl	2019-07-25	1	-5/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Workaround for Rails 5, where LIMIT..." See merge request gitlab-org/gitlab-ce!30780
\| * \| \| \| \| \| \| \| \| \|	Revert "Workaround for Rails 5, where LIMIT..."tc-revert-rails5-workaround	Toon Claes	2019-07-16	1	-5/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 6823e7defb45dfd86d5258b40d6f82482d1ef451. Originally implemented in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21839, but an error was reported in https://gitlab.com/gitlab-org/gitlab-ce/issues/51729 resulting in a workaround introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21879. Now Rails 5.2 is used, this workaround no longer seems needed, so this reverts it.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'add-caching-to-archive-endpoint' into 'master'	Grzegorz Bizon	2019-07-25	4	-7/+108
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Return an ETag header for the archive endpoint See merge request gitlab-org/gitlab-ce!30581