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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add committer approval API attributejramsay/committer-approval-api	James Ramsay	2019-08-06	1	-8/+10
\| \| \| \| \| \| \|	Merge Requests Approvals can be restricted to prevent the merge request author or merge request committers from self approving. The author restriction is already available in the API, but the committer restriction was not.
*	Merge branch '65660-update-karma-to-4.2.0' into 'master'65701-docs-feedback-add-a-link-to-a-gitmessage-template-that-can-be-used-for-commits	Mike Greiling	2019-08-06	3	-189/+228
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Update karma to 4.2.0 Closes #65660 See merge request gitlab-org/gitlab-ce!31495
\| *	Update karma to 4.2.0	Takuya Noguchi	2019-08-06	3	-189/+228
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also update karma-chrome-launcher, karma-coverage-istanbul-reporter, and karma-webpack. Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* \|	Merge branch '43080-speed-up-deploy-keys' into 'master'	Thong Kuah	2019-08-06	11	-48/+78
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve the performance of viewing deploy keys Closes #43080 See merge request gitlab-org/gitlab-ce!31384
\| * \|	Move migration from migrate to post_migrate43080-speed-up-deploy-keys	Stan Hu	2019-08-05	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is just in case the creation of this index takes a while to create.
\| * \|	Add partial index for deploy keys	Stan Hu	2019-08-05	2	-1/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Per https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/31384, this appears to drop the runtime of the query from 1.2 ms (cold), 500ms (warm cache) to < 20 ms.
\| * \|	Add spec for User#accessible_deploy_keys	Stan Hu	2019-08-05	1	-0/+18
\| \| \|
\| * \|	Speed up loading and filtering deploy keys and their projects	Nick Thomas	2019-08-05	7	-41/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit changes how we eager-load projects, routes, and namespaces required by the deploy keys endpoint, getting a 10x improvement in my local testing. The endpoint still doesn't scale in-general, but going from ~13 seconds to dump a 63K result to generating the same thing in ~1.6 seconds seems like a good improvement to me.
\| * \|	Stop using pluck to get deploy keys for a user	Nick Thomas	2019-08-05	2	-6/+6
\| \| \|
\| * \|	Fix a bug in User#accessible_deploy_keys	Nick Thomas	2019-08-05	1	-1/+1
\| \| \|
* \| \|	Merge branch 'make-issue-boards-importable' into 'master'	Sean McGivern	2019-08-06	10	-2/+124
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make issue boards importable See merge request gitlab-org/gitlab-ce!31434
\| * \| \|	Make issue boards importablemake-issue-boards-importable	Jason Colyer	2019-08-05	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Added issue board to imported contents in docs
\| * \| \|	Make issue boards importable	Jason Colyer	2019-08-05	1	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Removed extra changelog
\| * \| \|	Make issue boards importable	Jason Colyer	2019-08-05	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Created changelog
\| * \| \|	Make Issue boards importable	Jason Colyer	2019-08-05	2	-4/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Added space to li definiton - Remove milestone from import_export.yml
\| * \| \|	Make issue boards importable	Jason Colyer	2019-08-02	9	-2/+126
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Added Importable to models/list.rb - Did unless: :importable? on board validation - Created changelog - Modified haml to show issue boards are importable - Added needed spec tests - Modified project.json to include board information - Added relevant models to all_models - Added relevant models to import_export - Added relevant models to safe_model_attributes
* \| \| \|	Merge branch 'backport-productivty-analytics-migrations' into 'master'	Grzegorz Bizon	2019-08-06	6	-3/+42
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport productivity analytics migrations See merge request gitlab-org/gitlab-ce!31298
\| * \| \| \|	Add MergeRequestDiff#lines_count convenience methodbackport-productivty-analytics-migrations	Pavel Shutsin	2019-08-06	3	-0/+20
\| \| \| \| \|
\| * \| \| \|	Add inheritance flexibility to issuable collections	Pavel Shutsin	2019-08-06	1	-3/+2
\| \| \| \| \|
\| * \| \| \|	Add migrations for productivity analytics	Pavel Shutsin	2019-08-06	2	-0/+20
\| \| \| \| \|
* \| \| \| \|	Merge branch '9489-designs-annotations' into 'master'	Kushal Pandya	2019-08-06	6	-4/+31
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add point of interest discussions to designs" See merge request gitlab-org/gitlab-ce!31276
\| * \| \| \| \|	Revert "Fixed comparing value to undefined"	Natalia Tepluhina	2019-08-06	6	-4/+31
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit d754beb74fbc06a2c744e15be4aa2831d8cef1c0.
* \| \| \| \|	Merge branch '65263-manual-action' into 'master'	Kushal Pandya	2019-08-06	4	-12/+62
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hides loading spinner after request Closes #65263 See merge request gitlab-org/gitlab-ce!31478
\| * \| \| \| \|	Hides loading spinner after request65263-manual-action	Filipa Lacerda	2019-08-06	4	-12/+62
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In the pipeline's actions, moves the request to the component to allow to manage the inner state properly
* \| \| \| \| \|	Merge branch 'alerts-dropdown-to-modal-part-2-ce' into 'master'	Kushal Pandya	2019-08-06	3	-19/+79
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Alerts dropdown to modal CE2 See merge request gitlab-org/gitlab-ce!31181
\| * \| \| \| \| \|	Add actions dropdown to metrics charts	Simon Knox	2019-08-06	3	-19/+79
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added as EE backport
* \| \| \| \| \|	Merge branch '65606-docs-clarify-usage-of-elasticsearch-with-gitaly-nfs' ↵	Achilleas Pipinellis	2019-08-06	1	-1/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "DOCS Clarify usage of ElasticSearch with Gitaly non-NFS" Closes #65606 See merge request gitlab-org/gitlab-ce!31454
\| * \| \| \| \| \|	Resolve "DOCS Clarify usage of ElasticSearch with Gitaly non-NFS"	Anton Smith	2019-08-06	1	-1/+6
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'docs/edit-elasticsearch-troubleshooting' into 'master'	Achilleas Pipinellis	2019-08-06	1	-14/+14
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Edit new troubleshooting doc See merge request gitlab-org/gitlab-ce!31512
\| * \| \| \| \| \|	Edit new troubleshooting doc	Evan Read	2019-08-06	1	-14/+14
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'docs/more-crosslinking-of-cluster-topics' into 'master'	Achilleas Pipinellis	2019-08-06	1	-13/+21
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cross link between cluster topics Closes #65617 See merge request gitlab-org/gitlab-ce!31506
\| * \| \| \| \| \|	Cross link between cluster topics	Evan Read	2019-08-06	1	-13/+21
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'docs-ssot-customization' into 'master'	Achilleas Pipinellis	2019-08-06	7	-66/+192
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	SSoT for customization docs Closes #64588 See merge request gitlab-org/gitlab-ce!31308
\| * \| \| \| \| \|	SSoT work on customization docs	Matt Penna	2019-08-06	7	-66/+192
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed all docs in the customization section and updated them to adhere to our SSoT standards.
* \| \| \| \| \|	Merge branch 'update-reliable-fetcher' into 'master'	Sean McGivern	2019-08-06	3	-3/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update reliable fetcher See merge request gitlab-org/gitlab-ce!31416
\| * \| \| \| \| \|	Update reliable fetcherupdate-reliable-fetcher	Valery Sizov	2019-08-06	3	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We added retry_count increment when job is recovered
* \| \| \| \| \| \|	Merge branch 'winh-issue-boards-service-refactoring-note' into 'master'	Kushal Pandya	2019-08-06	1	-0/+5
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add note about refactoring to board_service.js See merge request gitlab-org/gitlab-ce!31468
\| * \| \| \| \| \|	Add note about refactoring to board_service.js	Winnie Hellmann	2019-08-06	1	-0/+5
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'docs-update-addon-minutes' into 'master'	Evan Read	2019-08-06	1	-1/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: add addon minute roll over info See merge request gitlab-org/gitlab-ce!31350
\| * \| \| \| \| \|	Docs: add addon minute roll over info	Tristan Williams	2019-08-06	1	-1/+4
\|/ / / / / /
* \| \| \| \| \|	Merge branch ↵	Evan Read	2019-08-06	2	-0/+346
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'65386-docs-add-elasticsearch-troubleshooting-to-administrator-troubleshooting-section' into 'master' Docs-Add ElasticSearch Troubleshooting Closes #65386 See merge request gitlab-org/gitlab-ce!31343
\| * \| \| \| \| \|	Add ElasticSearch troubleshooting	Jason Colyer	2019-08-06	2	-0/+346
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Added elasticsearch.md * Added reference to guide in Troubleshooting section
* \| \| \| \| \|	Merge branch 'sh-use-redis-caching-store' into 'master'	Ash McKenzie	2019-08-06	4	-9/+17
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Rails 5.2 Redis caching store Closes #64794 See merge request gitlab-org/gitlab-ce!30966
\| * \| \| \| \| \|	Use Rails 5.2 Redis caching storesh-use-redis-caching-store	Stan Hu	2019-08-05	4	-9/+17
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is the first step in providing a fault-tolerant and distributed Redis caching store. We disable compression to avoid introducing a change that could have an adverse effect in production. Note that we won't be able to take advantage of the fault-tolerance and distributed features yet until we solve https://gitlab.com/gitlab-org/gitlab-ce/issues/64829. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64794
* \| \| \| \| \|	Merge branch 'docs-fix-links-to-low-weight-issues' into 'master'	Ray Paik	2019-08-06	1	-3/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix links to unassigned, low weight issues for first time contributors See merge request gitlab-org/gitlab-ce!31485
\| * \| \| \| \| \|	Fix links to unassigned, low weight issues for first time contributors	John Hope	2019-08-05	1	-3/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix-diverging-counts-ruby2.5' into 'master'	Stan Hu	2019-08-06	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(Really) Fix Ruby 2.5 compatibility for diverging counts of branches Closes #64143 See merge request gitlab-org/gitlab-ce!31491
\| * \| \| \| \| \|	Fix Ruby 2.5 compatibility for diverging counts of branches	Daniel Gerhardt	2019-08-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	!31480 does not fully restore compatibility because another Ruby 2.6 feature besides `Enumerable#filter` was used in commit ca5cd7b7. The use of `Enumerable#to_h`'s block is now replaced by an explicit `Enumerable#map` call. Error message: TypeError (wrong element type Gitlab::Git::Branch at 0 (expected array)): app/controllers/projects/branches_controller.rb:53:in `to_h' See https://bugs.ruby-lang.org/issues/15143. Fixes #64143.
* \| \| \| \| \| \|	Merge branch 'dblessing-fix-admin-user-radio-labels' into 'master'	Clement Ho	2019-08-05	2	-2/+7
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Admin area user access level radio button labels See merge request gitlab-org/gitlab-ce!31154
\| * \| \| \| \| \|	Fix Admin area user access level radio button labels	Drew Blessing	2019-08-05	2	-2/+7
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In the admin user edit form, access level radio button labels didn't have the correct 'for' value. Clicking on the label did not select the radio button. This makes usability a bit nicer since the click area is increased when the label is clickable.