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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Replaced vue-resource for axios in the prometheus dashboardjivl-replace-vue-resource-prometheus-dashboard	Jose Ivan Vargas	2017-11-22	3	-26/+14
\|
*	Merge branch 'gitaly-bundle-changes' into 'master'	Rémy Coutable	2017-11-21	2	-10/+17
\|\ \| \| \| \| \| \| \| \|	Use `make install` for Gitaly setups in non-test environments See merge request gitlab-org/gitlab-ce!15295
\| *	Use `make install` for Gitaly setups in non-test environments	Alejandro Rodríguez	2017-11-21	2	-10/+17
\|/
*	Merge branch '40377-blank-states' into 'master'	Annabel Dunstone Gray	2017-11-21	5	-27/+46
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix blank states using old css Closes #40377 See merge request gitlab-org/gitlab-ce!15521
\| *	Fix blank states using old css40377-blank-states	Filipa Lacerda	2017-11-21	5	-27/+46
\| \|
* \|	Merge branch 'dz-improve-help-page' into 'master'	Annabel Dunstone Gray	2017-11-21	2	-21/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add wiki css to help page See merge request gitlab-org/gitlab-ce!15488
\| * \|	Remove unnecessary css for .documentation-indexdz-improve-help-page	Dmitriy Zaporozhets	2017-11-21	1	-12/+0
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Add wiki css to help page	Dmitriy Zaporozhets	2017-11-20	2	-9/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch 'sh-optimize-read-only-check' into 'master'	Douwe Maan	2017-11-21	2	-1/+18
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optimize read-only middleware so that it does not consume as much CPU Closes #40185 and gitlab-com/infrastructure#3240 See merge request gitlab-org/gitlab-ce!15504
\| * \| \|	Revert "check for `read_only?` first before seeing if request is disallowed"	digitalMoksha	2017-11-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 91075c8237307e09c2be8a88ffb3711fd62417d1.
\| * \| \|	check for `read_only?` first before seeing if request is disallowedsh-optimize-read-only-check	digitalMoksha	2017-11-21	1	-1/+1
\| \| \| \|
\| * \| \|	use `Gitlab::Routing.url_helpers` instead of ↵	digitalMoksha	2017-11-21	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`Rails.application.routes.url_helpers` since `Rails.application.routes.url_helpers` creates a new anonymous module every time it's called
\| * \| \|	Optimize read-only middleware so that it does not consume as much CPU	Stan Hu	2017-11-20	2	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In !15082, we changed the behavior of the middleware to call `Rails.application.routes.recognize_path` whenever a new route arrived. However, this can be a CPU-intensive task because Rails needs to allocate memory and compile 850+ different regular expressions, which are complicated in GitLab. As a short-term fix, we can do a lightweight string match before we do the heavier comparison. Closes #40185, gitlab-com/infrastructure#3240
* \| \| \|	Merge branch 'skip_confirmation_user_API' into 'master'	Rémy Coutable	2017-11-21	5	-1/+22
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Skip confirmation user api Closes #28934 See merge request gitlab-org/gitlab-ce!15175
\| * \| \| \|	Skip confirmation user api	Daniel Juarez	2017-11-21	5	-1/+22
\|/ / / /
* \| \| \|	Merge branch 'docs-custom-issue-tracker' into 'master'	Sean McGivern	2017-11-21	2	-0/+21
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Custom issue tracker See merge request gitlab-org/gitlab-ce!15516
\| * \| \|	Custom issue tracker	Victor Wu	2017-11-21	2	-0/+21
\|/ / /
* \| \|	Merge branch ↵	Sean McGivern	2017-11-21	6	-3/+66
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'39461-notes-api-for-issues-no-longer-returns-label-additions-removals' into 'master' Resolve "Notes API for issues no longer returns label additions/removals" Closes #39461 See merge request gitlab-org/gitlab-ce!15080
\| * \| \|	add `#with_metadata` scope to remove a N+1 from the notes' API	micael.bergeron	2017-11-21	2	-2/+3
\| \| \| \|
\| * \| \|	add the missing spec	micael.bergeron	2017-11-20	2	-2/+33
\| \| \| \|
\| * \| \|	fix the linting error39461-notes-api-for-issues-no-longer-returns-label-additions-removals	micael.bergeron	2017-11-16	1	-1/+1
\| \| \| \|
\| * \| \|	reverting to the simpler approach	micael.bergeron	2017-11-16	5	-25/+28
\| \| \| \|
\| * \| \|	try to fix the failing spec on external refs	micael.bergeron	2017-11-15	1	-1/+1
\| \| \| \|
\| * \| \|	fix the commit reference pattern from matching other entities	micael.bergeron	2017-11-15	3	-1/+29
\| \| \| \|
* \| \| \|	Merge branch '40367-tagspage-tags' into 'master'	Douwe Maan	2017-11-21	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "TagsPage\|Tags" Closes #40367 See merge request gitlab-org/gitlab-ce!15512
\| * \| \| \|	Use the correct i18n helper for namespaced string40367-tagspage-tags	Rémy Coutable	2017-11-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'zj-commit-show-n-1' into 'master'	Sean McGivern	2017-11-21	18	-56/+86
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Batch load blobs for diff generation Closes #37599 See merge request gitlab-org/gitlab-ce!15370
\| * \| \| \| \|	Batchload blobs for diff generation	Zeger-Jan van de Weg	2017-11-21	18	-56/+86
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	After installing a new gem, batch-loader, a construct can be used to queue data to be fetched in bulk. The gem was also introduced in both gitlab-org/gitlab-ce!14680 and gitlab-org/gitlab-ce!14846, but those mrs are not merged yet. For the generation of diffs, both the old blob and the new blob need to be loaded. This for every file in the diff, too. Now we collect all these so we do 1 fetch. Three `.allow_n_plus_1_calls` have been removed, which I expect to be valid, but this needs to be confirmed by a full CI run. Possibly closes: - https://gitlab.com/gitlab-org/gitlab-ce/issues/37445 - https://gitlab.com/gitlab-org/gitlab-ce/issues/37599 - https://gitlab.com/gitlab-org/gitlab-ce/issues/37431
* \| \| \| \| \|	Merge branch 'issue_40337' into 'master'	Sean McGivern	2017-11-21	3	-9/+55
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix promoting milestone updating all issuables without milestone Closes #40337 See merge request gitlab-org/gitlab-ce!15487
\| * \| \| \| \|	Fix promoting milestone updating all issuables without milestoneissue_40337	Felipe Artur	2017-11-21	3	-9/+55
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'gitaly-test-no-deployment' into 'master'	Sean McGivern	2017-11-21	2	-5/+3
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix slow gitaly dev test bundle See merge request gitlab-org/gitlab-ce!15508
\| * \| \| \| \|	Fix slow gitaly dev test bundle	Jacob Vosmaer (GitLab)	2017-11-21	2	-5/+3
\|/ / / / /
* \| \| \| \|	Merge branch '38869-milestone' into 'master'	Phil Hughes	2017-11-21	10	-209/+176
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Export code as ES6 modules See merge request gitlab-org/gitlab-ce!15503
\| * \| \| \| \|	Export code as ES6 modules38869-milestone	Filipa Lacerda	2017-11-20	10	-209/+176
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'backport-3434' into 'master'	Filipa Lacerda	2017-11-21	6	-3/+72
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport ability to enable/disable file attachments in issuable form See merge request gitlab-org/gitlab-ce!15433
\| * \| \| \| \|	Backport ability to enable/disable file attachments in issuable form	Clement Ho	2017-11-21	6	-3/+72
\|/ / / / /
* \| \| \| \|	Merge branch 'sh-memoize-gitlab-shell' into 'master'	Douwe Maan	2017-11-21	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Memoize GitlabShellAdapter for performance and ease of testing See merge request gitlab-org/gitlab-ce!15507
\| * \| \| \| \|	Memoize GitlabShellAdapter for performance and ease of testing	Stan Hu	2017-11-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3463#note_47990536
* \| \| \| \| \|	Merge branch '39821-fix-commits-list-with-multi-file-editor' into 'master'	Phil Hughes	2017-11-21	3	-0/+14
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix commits list 500 with multi-file editor new_repo cookie Closes #39821 See merge request gitlab-org/gitlab-ce!15502
\| * \| \| \| \| \|	Fix commits list 500 with multi-file editor new_repo cookie39821-fix-commits-list-with-multi-file-editor	Eric Eastwood	2017-11-20	3	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39821 /<namespace>/<project>/commmits/master
* \| \| \| \| \| \|	Merge branch 'rc/remove-useless-allow-failure' into 'master'	Grzegorz Bizon	2017-11-21	1	-2/+1
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove a useless `allow_failure: no` and use `true` instead of `yes` See merge request gitlab-org/gitlab-ce!15491
\| * \| \| \| \| \|	Remove a useless `allow_failure: no` and use `true` instead of `yes`rc/remove-useless-allow-failure	Rémy Coutable	2017-11-20	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch 'grpc-update' into 'master'	Robert Speicher	2017-11-21	1	-2/+2
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update gRPC to v1.7.2 Closes gitaly#742 See merge request gitlab-org/gitlab-ce!15439
\| * \| \| \| \| \|	Update gRPC to v1.7.2	Alejandro Rodríguez	2017-11-20	1	-2/+2
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This solves a problem where Gitaly connections through Unix sockets would not work when a proxy was configures, even if a no_proxy setting was specified
* \| \| \| \| \|	Merge branch '40290-remove-rake-gitlab-sidekiq-drop-post-receive' into 'master'	Nick Thomas	2017-11-20	2	-47/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove the rake task `gitlab:sidekiq:drop_post_receive` Closes #40290 See merge request gitlab-org/gitlab-ce!15493
\| * \| \| \| \| \|	added changelog entry40290-remove-rake-gitlab-sidekiq-drop-post-receive	digitalMoksha	2017-11-20	1	-0/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	remove the rake task `gitlab:sidekiq:drop_post_receive`	digitalMoksha	2017-11-20	1	-47/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This task is no longer being used and is not documented.
* \| \| \| \| \| \|	Merge branch 'fix-mr-cleanup' into 'master'	Sean McGivern	2017-11-20	1	-4/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix merge_requests.source_project_id migration See merge request gitlab-org/gitlab-ce!15496
\| * \| \| \| \| \| \|	Fix merge_requests.source_project_id migrationfix-mr-cleanup	Yorick Peterse	2017-11-20	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We need to make sure merge_requests.source_project_id allows NULL values _before_ updating rows as otherwise this will lead to a NOT NULL constraint failing.
* \| \| \| \| \| \| \|	Merge branch '1870-impersonation-stuck-on-password-change-ce' into 'master'	Sean McGivern	2017-11-20	4	-4/+34
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE] Impersonation no longer gets stuck on password change. Closes #13888 See merge request gitlab-org/gitlab-ce!15497