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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Get memory data after booting app in production62722-boot-app-in-ci-and-check-memory	Aleksei Lipniagov	2019-06-28	4	-5/+40
\| \| \| \| \| \|	Preload the app in `production` env, hit it with a single request, and gather total gem memory consumption data using `derailed exec perf:mem` from `derailed_benchmarks`. Present the result as MR metrics.
*	Merge branch 'set-higher-ttl-for-trace-write' into 'master'	Kamil Trzciński	2019-06-28	3	-2/+7
\|\ \| \| \| \| \| \| \| \|	Set higher TTL to write lock for traces See merge request gitlab-org/gitlab-ce!30064
\| *	Set higher TTL to write lock for tracesset-higher-ttl-for-trace-write	Shinya Maeda	2019-06-28	3	-2/+7
\| \| \| \| \| \| \| \|	Set higher TTL is safer option when it comes to long running archive
* \|	Merge branch 'docs/secure-maintenance' into 'master'	Marcia Ramos	2019-06-28	5	-5/+48
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document the security tools maintenance and vulnerabilities DB update Closes gitlab-ee#9986 See merge request gitlab-org/gitlab-ce!29840
\| * \|	Document the security tools maintenance and vulnerabilities DB updatedocs/secure-maintenance	Achilleas Pipinellis	2019-06-26	5	-5/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Addresses the following questions: - How often do we update the vulnerability DB or analyzers? - Do we have to update GitLab to benefit from latest vulnerabilities definitions?
* \| \|	Merge branch 'sh-support-subnets-ip-rate-limiter' into 'master'	Thong Kuah	2019-06-28	5	-3/+94
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support CIDR notation in IP rate limiter See merge request gitlab-org/gitlab-ce!30146
\| * \| \|	Support CIDR notation in IP rate limitersh-support-subnets-ip-rate-limiter	Stan Hu	2019-06-27	5	-3/+94
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will make it possible to whitelist multiple IP addresses (e.g. 192.168.0.1/24).
* \| \| \|	Merge branch 'graphql-tree-last-commit' into 'master'	Lin Jen-Shin	2019-06-28	12	-3/+139
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added commit type to tree GraphQL type See merge request gitlab-org/gitlab-ce!29412
\| * \| \| \|	Added commit type to tree GraphQL type	Phil Hughes	2019-06-28	12	-3/+139
\| \| \| \| \|
* \| \| \| \|	Merge branch 'id-extract-widget-into-different-request' into 'master'	Ash McKenzie	2019-06-28	12	-14/+111
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract MR's widget into a separate request Closes #62723 See merge request gitlab-org/gitlab-ce!29979
\| * \| \| \| \|	Extract MR's widget into a separate endpointid-extract-widget-into-different-request	Igor Drozdov	2019-06-28	12	-14/+111
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commits extracts /merge_requests/1.json?serializer=widget Into a separate /merge_requests/1/widget.json endpoint This will allow to use caching for this request
* \| \| \| \| \|	Merge branch '44949-do-not-update-updated_at-on-an-issue-when-reordering-it' ↵	Douwe Maan	2019-06-28	4	-13/+71
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Do not change updated_at on an issue when reordering on an issue board See merge request gitlab-org/gitlab-ce!29677
\| * \| \| \| \| \|	Do not change updated_at on an issue when reordering on an issue board	Eugenia Grieff	2019-06-28	4	-13/+71
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'sh-fix-issue-12303' into 'master'	Grzegorz Bizon	2019-06-28	1	-1/+9
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport CE changes for multiple GroupSAML support See merge request gitlab-org/gitlab-ce!30102
\| * \| \| \| \| \|	Backport CE changes for multiple GroupSAML supportsh-fix-issue-12303	Stan Hu	2019-06-27	1	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit makes it possible for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14420 to handle multiple SAML providers.
* \| \| \| \| \| \|	Merge branch '62968-environment-details-header-border-misaligned' into 'master'	Kushal Pandya	2019-06-28	2	-15/+18
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Environment details header border misaligned" Closes #62968 See merge request gitlab-org/gitlab-ce!30011
\| * \| \| \| \| \| \|	Align page header for environment details view62968-environment-details-header-border-misaligned	Dave Pisek	2019-06-28	2	-15/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit fixes an issue that caused the page header on the environment details page to be misaligned and bleeding out horizontlly. It removes standard bootstrap markup / classes and replaces it with utility classes.
* \| \| \| \| \| \| \|	Merge branch 'ce-11098-update-merge-request-settings-description-text' into ↵	Filipa Lacerda	2019-06-28	4	-4/+10
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' CE backport for gitlab-org/gitlab-ee!11859: Update description text of "Merge requests" section of general project settings page See merge request gitlab-org/gitlab-ce!27838
\| * \| \| \| \| \| \| \|	Update project MR setting section description (CE)	Nathan Friend	2019-06-25	4	-4/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit updates the merge requests description text in the project settings page.
* \| \| \| \| \| \| \| \|	Merge branch '6360-tree-header' into 'master'	Phil Hughes	2019-06-28	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes EE differences for app/views/projects/tree/_tree_header.html.haml See merge request gitlab-org/gitlab-ce!30117
\| * \| \| \| \| \| \| \| \|	Removes EE differences6360-tree-header	Filipa Lacerda	2019-06-27	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'docs/edit-cluster-admin-note-text' into 'master'	Achilleas Pipinellis	2019-06-28	1	-10/+8
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Edit Cluster Admin note text Closes #63558 See merge request gitlab-org/gitlab-ce!29965
\| * \| \| \| \| \| \| \| \| \|	Edit Cluster Admin note text	Evan Read	2019-06-28	1	-10/+8
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch '63212-n-1-queries-in-projects-id-boards-api' into 'master'	Thong Kuah	2019-06-28	7	-5/+19
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove N+1 queries in boards API See merge request gitlab-org/gitlab-ce!29634
\| * \| \| \| \| \| \| \| \| \|	Move order lambda to list scope63212-n-1-queries-in-projects-id-boards-api	charlieablett	2019-06-27	2	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- apply ordering to both list scopes in `Board`
\| * \| \| \| \| \| \| \| \| \|	Compound lists scopes to preserve ordering	charlieablett	2019-06-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Remove `with_associations` from BoardSerializer	charlieablett	2019-06-26	1	-8/+0
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Remove N+1 query for project and group boards	charlieablett	2019-06-26	7	-4/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Add test for N+1 queries - Add destroyable lists scope to Board and List - Preload lists for both project and group boards
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'vue-i18n-js-performance-bar-directory' into 'master'	Kushal Pandya	2019-06-28	3	-7/+26
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Vue-i18n: autofix for app/assets/javascripts/performance_bar directory See merge request gitlab-org/gitlab-ce!30014
\| * \| \| \| \| \| \| \| \| \| \|	Namespace performance bar translationsvue-i18n-js-performance-bar-directory	Ezekiel Kigbo	2019-06-28	3	-19/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added additional translations
\| * \| \| \| \| \| \| \| \| \| \|	Vue-i18n: app/assets/javascripts/performance_bar/ directory	Ezekiel Kigbo	2019-06-27	2	-6/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	i18n linting for .vue files under the app/assets/javascripts/performance_bar/ directory
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs/add-docs-site-arch-diagram' into 'master'	Achilleas Pipinellis	2019-06-28	1	-5/+37
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add diagram to site architecture docs See merge request gitlab-org/gitlab-ce!30147
\| * \| \| \| \| \| \| \| \| \| \| \|	Add diagram to site architecture docs	Evan Read	2019-06-28	1	-5/+37
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '62826-graphql-emoji-mutations' into 'master'	Jan Provaznik	2019-06-28	25	-6/+745
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GraphQL mutations for add, remove and toggle emoji See merge request gitlab-org/gitlab-ce!29919
\| * \| \| \| \| \| \| \| \| \| \| \|	GraphQL mutations for add, remove and toggle emoji62826-graphql-emoji-mutations	Luke Duncalfe	2019-06-28	25	-6/+745
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding new `AddAwardEmoji`, `RemoveAwardEmoji` and `ToggleAwardEmoji` GraphQL mutations. Adding new `#authorized_find_with_pre_checks!` and (unused, but for completeness `#authorized_find_with_post_checks!`) authorization methods. These allow us to perform an authorized find, and run our own additional checks before or after the authorization runs. https://gitlab.com/gitlab-org/gitlab-ce/issues/62826
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '58689-regroup-jump-button-in-discussion' into 'master'	Phil Hughes	2019-06-28	7	-22/+54
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rearrange discussion resolve buttons Closes #58689 See merge request gitlab-org/gitlab-ce!29779
\| * \| \| \| \| \| \| \| \| \| \| \|	Rearrange discussion resolve buttons & update button display	Samantha Ming	2019-06-28	7	-22/+54
\|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- next-discuss button is always show unless there is only 1 discussion - regroup buttons arrangements
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'support-jsonb-default-value' into 'master'	Thong Kuah	2019-06-28	3	-1/+25
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support jsonb Default Value in add_column_with_default Migration Helper See merge request gitlab-org/gitlab-ce!29871
\| * \| \| \| \| \| \| \| \| \| \|	Support jsonb Default Value in add_column_with_default Migration Helper	Jason Goodman	2019-06-28	3	-1/+25
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-style-guide-links-docs' into 'master'	Evan Read	2019-06-28	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken style guide links See merge request gitlab-org/gitlab-ce!30149
\| * \| \| \| \| \| \| \| \| \| \|	Fix broken style guide links	charlie ablett	2019-06-28	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs/admin_area_monitoring' into 'master'	Evan Read	2019-06-28	1	-1/+64
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57874 Closes #57874 See merge request gitlab-org/gitlab-ce!30013
\| * \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57874	Russell Dickenson	2019-06-28	1	-1/+64
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs-appdev-platform-udpates' into 'master'	Evan Read	2019-06-28	1	-4/+13
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Application Development Platform docs updates See merge request gitlab-org/gitlab-ce!30058
\| * \| \| \| \| \| \| \| \| \| \|	Application Development Platform docs updates	Daniel Gruesso	2019-06-28	1	-4/+13
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'ek-js-example-spltting-strings-with-links' into 'master'	Evan Read	2019-06-28	1	-12/+33
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update documentation examples of string splitting See merge request gitlab-org/gitlab-ce!30009
\| * \| \| \| \| \| \| \| \| \|	Update info on externalizing links	Ezekiel Kigbo	2019-06-28	1	-12/+33
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added example for splitting strings with links in javascript and sentence to interpolation.
* \| \| \| \| \| \| \| \| \|	Merge branch 'docs-serverless-ssl' into 'master'	Evan Read	2019-06-28	2	-0/+272
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs serverless ssl See merge request gitlab-org/gitlab-ce!29946
\| * \| \| \| \| \| \| \| \|	Docs serverless ssl	Daniel Gruesso	2019-06-28	2	-0/+272
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'remove_group_and_instance_clusters_feature_flag' into 'master'	Stan Hu	2019-06-27	15	-196/+72
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove group and instance clusters feature flag Closes #63383 See merge request gitlab-org/gitlab-ce!30124