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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Releases doc - ssotdocs-ssot-july-2	Marcia Ramos	2019-07-26	1	-0/+16
\|
*	Merge branch 'pl-flat_map-ce' into 'master'	Lin Jen-Shin	2019-07-26	9	-16/+14
\|\ \| \| \| \| \| \| \| \|	Prefer `flat_map` over `map` + `flatten` See merge request gitlab-org/gitlab-ce!31144
\| *	Prefer `flat_map` over `map` + `flatten`	Peter Leitzen	2019-07-26	9	-16/+14
\|/ \| \| \| \|	Convert several occurrences of `map` + `flatten` to `flat_map` where applicable.
*	Merge branch 'docs-label-filtering' into 'master'	Sean McGivern	2019-07-26	2	-0/+170
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add development documentation on label filtering Closes #49651 See merge request gitlab-org/gitlab-ce!30741
\| *	Add development documentation on label filteringdocs-label-filtering	Sean McGivern	2019-07-25	2	-0/+170
\| \| \| \| \| \| \| \| \| \| \| \|	This topic comes up periodically, and we've investigated several options for changing the way we filter labels. Unfortunately, we have yet to find an option that is strictly better than the current state.
* \|	Merge branch 'renovate/gitlab-ui-5.x' into 'master'	Fatih Acet	2019-07-26	12	-20/+22
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update dependency @gitlab/ui to ^5.9.0 See merge request gitlab-org/gitlab-ce!31153
\| * \|	Karma: Fix css selector for loading icon	Lukas 'Eipi' Eipert	2019-07-26	12	-20/+22
\|/ / \| \| \| \| \| \| \| \|	The GitLab UI update changed the spinner selector from `spinner` to `gl-spinner`, so we need to update it, so that our tests won't fail.
* \|	Merge branch 'extract_auto_deploy_into_base_image' into 'master'	Dmitriy Zaporozhets	2019-07-26	3	-376/+53
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract Auto DevOps deploy functions in a base image Closes #50286 See merge request gitlab-org/gitlab-ce!30404
\| * \|	Extract deploy functions in a base imageextract_auto_deploy_into_base_image	Thong Kuah	2019-07-25	3	-376/+53
\| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/cluster-integration/auto-deploy-image
* \| \|	Merge branch 'delete-designs-v2' into 'master'	Andreas Brandl	2019-07-26	3	-0/+33
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds event enum column to DesignsVersions join table See merge request gitlab-org/gitlab-ce!30745
\| * \| \|	Adds event enum column to DesignsVersions join tabledelete-designs-v2	Alex Kalderimis	2019-07-24	3	-0/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also adds index to support scopes and queries This supports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14656
* \| \| \|	Merge branch 'mh/editor-indents' into 'master'	Kushal Pandya	2019-07-26	16	-39/+1287
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support indentation in the markdown editor Closes #25070 See merge request gitlab-org/gitlab-ce!28914
\| * \| \| \|	Add UndoStack class - a custom undo/redo engine	Martin Hanzel	2019-07-26	16	-39/+1287
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	It will be hooked up to the markdown editor later
* \| \| \|	Merge branch 'if-64257-warden_set_user_fix' into 'master'	James Lopez	2019-07-26	7	-15/+53
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure Warden triggers after_authentication callback See merge request gitlab-org/gitlab-ce!31138
\| * \| \| \|	Ensure Warden triggers after_authentication callback	Imre Farkas	2019-07-26	7	-15/+53
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By not triggering the callback: - ActiveSession lookup keys are not cleaned - Devise also misses its hook related to session cleanup
* \| \| \|	Merge branch 'qa-sl-nightly-117-stablize-editing-scope-label-spec-ce' into ↵	Ramya Authappan	2019-07-26	1	-1/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' CE port of "Stablize editing scope label spec - retry if dropdown is not visible" See merge request gitlab-org/gitlab-ce!31145
\| * \| \| \|	Retry if dropdown is not visibleqa-sl-nightly-117-stablize-editing-scope-label-spec-ce	Sanad Liaquat	2019-07-25	1	-1/+4
\| \| \| \| \|
* \| \| \| \|	Merge branch '63568-access-email-notifications-custom-email' into 'master'	Lin Jen-Shin	2019-07-26	7	-22/+45
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Respect alt email when sending group access notifications See merge request gitlab-org/gitlab-ce!31089
\| * \| \| \| \|	Respect alt email when sending group access notifications63568-access-email-notifications-custom-email	Mario de la Ossa	2019-07-25	7	-22/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When sending access granted/rejected emails we should also respect custom emails set for groups/sub-groups
* \| \| \| \| \|	Merge branch 'tr-embed-metrics-feature-test' into 'master'	Thong Kuah	2019-07-26	2	-0/+68
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feature test for gfm embedding metrics See merge request gitlab-org/gitlab-ce!30621
\| * \| \| \| \| \|	Feature test for gfm embedding metrics	Tristan Read	2019-07-26	2	-0/+68
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'ab-dbreview-prep' into 'master'	Evan Read	2019-07-26	1	-0/+11
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add points how to prepare for database reviews Closes #65126 See merge request gitlab-org/gitlab-ce!31158
\| * \| \| \| \| \|	Add points how to prepare for database reviewsab-dbreview-prep	Andreas Brandl	2019-07-25	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/65126. Came up in the database office hours call on 2019-07-25.
* \| \| \| \| \| \|	Merge branch '20190708_CI_Docspage_Edits' into 'master'	Evan Read	2019-07-26	3	-0/+16
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CI Docs update for Marketing See merge request gitlab-org/gitlab-ce!30440
\| * \| \| \| \| \| \|	Update README.md - add CTA to watch Mastering CI/CD webcast and 5 teams that ↵	Agnes Oetama	2019-07-26	3	-0/+16
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	made the switch to GitLab CI/CD article
* \| \| \| \| \| \|	Merge branch 'docs-support-annotation-template' into 'master'	Evan Read	2019-07-26	1	-1/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs for template field in prometheus alerts See merge request gitlab-org/gitlab-ce!30900
\| * \| \| \| \| \| \|	Add docs for template field in prometheus alerts	Sarah Yasonik	2019-07-26	1	-1/+2
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'docs-troubleshooting-for-merge-train' into 'master'	Evan Read	2019-07-25	4	-20/+85
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Troubleshooting section for Merge Train documentation Closes #64948 See merge request gitlab-org/gitlab-ce!31033
\| * \| \| \| \| \| \|	Add trouble shooting for Merge Train	Shinya Maeda	2019-07-25	4	-20/+85
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add trouble shooting sections
* \| \| \| \| \| \|	Merge branch 'docs-its-relative-9' into 'master'	Evan Read	2019-07-25	6	-54/+48
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update links to relative Closes #61945 See merge request gitlab-org/gitlab-ce!31084
\| * \| \| \| \| \| \|	Update links to relative	Marcel Amirault	2019-07-25	6	-54/+48
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Following the single docs codebase change, all internal links should be relative. Also cleans up one table
* \| \| \| \| \| \|	Merge branch '65088-incorrect-message-interpolation-on-project-listing' into ↵	Fatih Acet	2019-07-25	3	-1/+21
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Incorrect message interpolation on project listing" Closes #65088 See merge request gitlab-org/gitlab-ce!31121
\| * \| \| \| \| \| \|	Fix incorrect use of message interpolation65088-incorrect-message-interpolation-on-project-listing	Alex Kalderimis	2019-07-24	3	-1/+21
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/65088
* \| \| \| \| \| \|	Merge branch 'print-sidekiq-class-name-in-memory-killer' into 'master'	Stan Hu	2019-07-25	2	-7/+19
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Logging sidekiq worker class name in SidekiqMemoryKiller See merge request gitlab-org/gitlab-ce!30996
\| * \| \| \| \| \| \|	Logging sidekiq worker class name in SidekiqMemoryKillerprint-sidekiq-class-name-in-memory-killer	Shinya Maeda	2019-07-25	2	-7/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently, SidekiqMemoryKiller does not feed worker class name in the json structured logging. This commit extends the json parameter.
* \| \| \| \| \| \| \|	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