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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Disable /dev/shm in CIsh-disable-dev-shm	Stan Hu	2017-12-22	2	-0/+6
\| \| \| \| \| \| \| \| \| \| \|	According to the Chrome source code (https://chromium.googlesource.com/chromium/src/base/+/master/base_switches.cc#120): The /dev/shm partition is too small in certain VM environments, causing Chrome to fail or crash (see http://crbug.com/715363). Use this flag to work-around this issue (a temporary directory will always be used to create anonymous shared memory files). Addresses gitlab-org/gitlab-ee#4252 but doesn't appear to cure it completely.
*	Merge branch 'fix/last-push-event-widget-layout' into 'master'	Clement Ho	2017-12-21	3	-14/+21
\|\ \| \| \| \| \| \| \| \|	Last push event widget width for fixed layout #40268 See merge request gitlab-org/gitlab-ce!15862
\| *	Last push event widget width for fixed layout	George Tsiolis	2017-12-21	3	-14/+21
\| \|
* \|	Merge branch '41268-bump-ruby-to-2-3-6' into 'master'	Robert Speicher	2017-12-21	3	-2/+7
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Bump Ruby to 2.3.6" See merge request gitlab-org/gitlab-ce!16016
\| * \|	Update Ruby version to 2.3.641268-bump-ruby-to-2-3-6	Rémy Coutable	2017-12-21	3	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch 'docs/update-doc-for-ruby-2-3-6' into 'master'	Robert Speicher	2017-12-21	4	-8/+368
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \|	Update installation and upgrade guides to use Ruby 2.3.6 See merge request gitlab-org/gitlab-ce!16038
\| * \|	Update installation and upgrade guides to use Ruby 2.3.6docs/update-doc-for-ruby-2-3-6	Rémy Coutable	2017-12-20	4	-8/+368
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch '33609-hide-pagination' into 'master'	Clement Ho	2017-12-21	3	-1/+28
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not show Vue pagination if only one page Closes #33609 See merge request gitlab-org/gitlab-ce!15999
\| * \| \|	Do not show Vue pagination if only one page	Mario de la Ossa	2017-12-21	3	-1/+28
\| \| \| \|
* \| \| \|	Merge branch 'patch-28' into 'master'	Jacob Schatz	2017-12-21	5	-73/+218
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added 'admin' persona See merge request gitlab-org/gitlab-ce!15470
\| * \| \| \|	Added 'admin' persona	Sarah O'Donnell	2017-12-21	5	-73/+218
\| \| \| \| \|
* \| \| \| \|	Merge branch 'docs-move-article-artifactory' into 'master'	Achilleas Pipinellis	2017-12-21	5	-299/+298
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: move article Artifactory + GL to subject-related folder See merge request gitlab-org/gitlab-ce!16081
\| * \| \| \|	Docs: move article Artifactory + GL to subject-related folder	Marcia Ramos	2017-12-21	5	-299/+298
\|/ / / /
* \| \| \|	Merge branch 'diff-worker-js-fix' into 'master'	Jacob Schatz	2017-12-21	1	-1/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed diff_worker not compiling correctly Closes #41182 See merge request gitlab-org/gitlab-ce!15966
\| * \| \| \|	changed webpack configdiff-worker-js-fix	Phil Hughes	2017-12-16	2	-3/+5
\| \| \| \| \|
\| * \| \| \|	Fixed diff_worker not compiling correctly	Phil Hughes	2017-12-15	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #41182
* \| \| \| \|	Merge branch 'docs-move-transfer-project-to-group' into 'master'	Achilleas Pipinellis	2017-12-21	5	-84/+171
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor user, project and group docs when changing namespace See merge request gitlab-org/gitlab-ce!16019
\| * \| \| \| \|	Mention GitLab Pages when changing username	John Doe	2017-12-21	1	-1/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Consolidate the docs when changing a repo path	John Doe	2017-12-21	4	-115/+164
\| \| \| \| \| \|
\| * \| \| \| \|	Add docs for automatic redirects when renaming namespaces	Achilleas Pipinellis	2017-12-21	2	-6/+42
\| \| \| \| \| \|
\| * \| \| \| \|	move "Transfer an existing project into a group" to project docs	Marcia Ramos	2017-12-21	3	-16/+16
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- move the section - replace identifiers with inline links - update settings (General settings > Advanced settings)
* \| \| \| \|	Merge branch 'jprovazn-search' into 'master'	Yorick Peterse	2017-12-21	5	-3/+34
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Skip projects filter on merge requests search See merge request gitlab-org/gitlab-ce!15955
\| * \| \| \| \|	Skip projects filter on merge requests searchjprovazn-search	Jan Provaznik	2017-12-21	5	-3/+34
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When searching for merge requests, an additional subquery is added which by default filters only merge requests which belong to source or target project user has permission for. This filter is not needed because more restrictive filter which checks if user has permission for target project is used in the query. So unless a custom projects filter is used by user, it's possible to skip the default projects filter and speed up the final query. Related to #40540
* \| \| \| \|	Merge branch 'fix-webpack-chunk-naming' into 'master'	Jacob Schatz	2017-12-21	3	-3/+13
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Properly name webpack chunks for dynamic imports See merge request gitlab-org/gitlab-ce!16066
\| * \ \ \ \	Merge branch 'master' into fix-webpack-chunk-naming	Clement Ho	2017-12-21	299	-2357/+4831
\| \|\ \ \ \ \
\| * \| \| \| \| \|	update dispatcher to allow for dynamic imports until webpack plugin is updatedfix-webpack-chunk-naming	Mike Greiling	2017-12-20	2	-1/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	properly handle naming for dispatcher route chunks	Mike Greiling	2017-12-20	1	-2/+7
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'pawel/reduce_cardinality_of_prometheus_metrics' into 'master'	Douwe Maan	2017-12-21	9	-26/+39
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce cardinality of some of GitLab's Prometheus metrics and fix observed duration reporting. Closes #41045 See merge request gitlab-org/gitlab-ce!15881
\| * \| \| \| \| \| \|	add missing word to pawel-reduce_cardinality_of_prometheus_metrics.ymlpawel/reduce_cardinality_of_prometheus_metrics	Paweł Chojnacki	2017-12-20	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Use seconds where possible, and convert to milliseconds for Influxdb consumption	Pawel Chojnacki	2017-12-21	5	-28/+31
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	use in_milliseconds rails helper	Pawel Chojnacki	2017-12-20	2	-3/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix tests and formatting	Pawel Chojnacki	2017-12-19	4	-7/+8
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Make `System.monotonic_time` retun seconds represented by float with ↵	Pawel Chojnacki	2017-12-12	6	-17/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	microsecond precision
\| * \| \| \| \| \| \|	Fix gitaly_call_histogram to observe times in seconds correctly	Pawel Chojnacki	2017-12-12	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Reduce cardinality of gitlab_cache_operation_duration_seconds histogram	Pawel Chojnacki	2017-12-12	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'bvl-patch-mr-serializer' into 'master'	Douwe Maan	2017-12-21	3	-3/+11
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fall back to the `MergeRequestWidgetEntity` Closes #41296 See merge request gitlab-org/gitlab-ce!16074
\| * \| \| \| \| \| \|	Fall back to the `MergeRequestWidgetEntity`	Bob Van Landuyt	2017-12-21	3	-3/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When no serializer was passed.
* \| \| \| \| \| \| \|	Merge branch '40040-decouple-multi-file-editor-from-file-list' into 'master'	Phil Hughes	2017-12-21	136	-1734/+2867
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Decouple multi-file editor from file list" Closes #40040 and #40032 See merge request gitlab-org/gitlab-ce!15430
\| * \| \| \| \| \| \|	Resolve "Decouple multi-file editor from file list"	Tim Zallmann	2017-12-21	136	-1734/+2867
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'organise-by-subject' into 'master'	Marcia Ramos	2017-12-21	1	-0/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	organise content by subject See merge request gitlab-org/gitlab-ce!16080
\| * \| \| \| \| \| \|	organise content by subjectorganise-by-subject	Job van der Voort	2017-12-21	1	-0/+4
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'fj-40279-normalize-ldap-dn-api' into 'master'	Douwe Maan	2017-12-21	5	-1/+72
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	LDAP extern_uids are not normalized when updated via API Closes #40279 See merge request gitlab-org/gitlab-ce!16004
\| * \| \| \| \| \|	LDAP extern_uids are not normalized when updated via API	Francisco Javier López	2017-12-21	5	-1/+72
\|/ / / / / /
* \| \| \| \| \|	Merge branch ↵	Marcia Ramos	2017-12-21	1	-0/+50
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'41342-add-ci-yml-example-for-browser-performance-testing-in-ce' into 'master' Add CI YML example for Browser Performance Testing in CE See merge request gitlab-org/gitlab-ce!16058
\| * \| \| \| \| \|	Add CI YML example for CE41342-add-ci-yml-example-for-browser-performance-testing-in-ce	Joshua Lambert	2017-12-20	1	-0/+50
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '41227-document-volume-mounts-with-docker-dind' into 'master'	Achilleas Pipinellis	2017-12-21	1	-0/+15
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Docker volumes not mounted when using docker:dind" See merge request gitlab-org/gitlab-ce!16070
\| * \| \| \| \| \| \|	Document mounting volumes with Docker-in-Docker	Teresa e Junior	2017-12-21	1	-0/+15
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'winh-fix-datetime_utility' into 'master'	Filipa Lacerda	2017-12-21	1	-5/+13
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restore missing language code in datetime_utility.js Closes #41248 See merge request gitlab-org/gitlab-ce!16009
\| * \| \| \| \| \| \| \|	Restore missing language code in datetime_utility.js	Winnie Hellmann	2017-12-21	1	-5/+13
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'fix-remove-dead-spinach-steps' into 'master'	Nick Thomas	2017-12-21	1	-11/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove two unused step definitions from spinach See merge request gitlab-org/gitlab-ce!16047