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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Use slug as the prefix for the docs CI job preview URLdocs/use-slug-as-prefix-in-ci-docs-job	Achilleas Pipinellis	2017-11-17	2	-2/+2
\|
*	Merge branch 'dm-go-get-blank-enabled-protocol' into 'master'	Sean McGivern	2017-11-17	2	-3/+10
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix go-import meta data when enabled_git_access_protocol is a blank string Closes #40256 See merge request gitlab-org/gitlab-ce!15448
\| *	Fix go-import meta data when enabled_git_access_protocol is a blank string	Douwe Maan	2017-11-17	2	-3/+10
\| \|
* \|	Merge branch '34600-performance-wiki-pages' into 'master'	Douwe Maan	2017-11-17	10	-27/+102
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Performance issues when loading large number of wiki pages" Closes #34600 See merge request gitlab-org/gitlab-ce!15276
\| * \|	Resolve "Performance issues when loading large number of wiki pages"	Francisco Javier López	2017-11-17	10	-27/+102
\|/ /
* \|	Merge branch '38869-project-1' into 'master'	Phil Hughes	2017-11-17	8	-311/+272
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Exports a couple of project related code as es6 modules See merge request gitlab-org/gitlab-ce!15356
\| * \|	Exports a couple of project related code as es6 modules	Filipa Lacerda	2017-11-17	8	-311/+272
\|/ /
* \|	Merge branch 'sh-background-migration-move-mr-diff-id' into 'master'	Sean McGivern	2017-11-17	5	-33/+130
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Convert migration to populate latest merge request ID into a background migration See merge request gitlab-org/gitlab-ce!15440
\| * \|	Convert migration to populate latest merge request ID into a background ↵	Stan Hu	2017-11-17	5	-33/+130
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	migration This is to smear updates over a few hours to avoid causing excessive replication lag as seen in https://gitlab.com/gitlab-com/infrastructure/issues/3235.
* \| \|	Merge branch 'dropdown-docs' into 'master'	Phil Hughes	2017-11-17	2	-0/+40
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add dropdowns documentation See merge request gitlab-org/gitlab-ce!15396
\| * \| \|	Add dropdowns documentation	Filipa Lacerda	2017-11-17	2	-0/+40
\|/ / /
* \| \|	Merge branch 'mk-update-database-debugging' into 'master'	Yorick Peterse	2017-11-17	1	-4/+11
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update database_debugging.md See merge request gitlab-org/gitlab-ce!15434
\| * \| \|	Update database_debugging.mdmk-update-database-debugging	Michael Kozono	2017-11-16	1	-4/+11
\| \| \| \|
* \| \| \|	Merge branch 'rc/use-existing-url-helper' into 'master'	Grzegorz Bizon	2017-11-17	4	-19/+11
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace ci_status_path with pipeline_path See merge request gitlab-org/gitlab-ce!15369
\| * \| \| \|	Replace ci_status_path with pipeline_pathrc/use-existing-url-helper	Rémy Coutable	2017-11-14	4	-19/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'sh-deduplicate-background-migration-specs' into 'master'	Sean McGivern	2017-11-17	2	-32/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	De-duplicate background migration matchers defined in spec/support/migrations_helpers.rb See merge request gitlab-org/gitlab-ce!15441
\| * \| \| \| \|	De-duplicate background migration matchers defined in ↵sh-deduplicate-background-migration-specs	Stan Hu	2017-11-16	2	-32/+6
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	spec/support/migrations_helpers.rb
* \| \| \| \|	Merge branch 'patch-28' into 'master'	Achilleas Pipinellis	2017-11-17	1	-1/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update HA README.md to clarify GitLab support does not troubleshoot DRBD. See merge request gitlab-org/gitlab-ce!15428
\| * \| \| \| \|	Update HA README.md to clarify GitLab support does not troubleshoot DRBD.	Lee Matos	2017-11-16	1	-1/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix/sm/fix-condeclimate-version' into 'master'	Winnie Hellmann	2017-11-17	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set 0.69.0 instead of latest for codeclimate image See merge request gitlab-org/gitlab-ce!15445
\| * \| \| \| \|	Set 0.69.0 instead of latest for codeclimate image	Shinya Maeda	2017-11-17	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge branch 'docs/refactor-cluster' into 'master'	Marcia Ramos	2017-11-16	2	-33/+47
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor Cluster docs Closes #39952 See merge request gitlab-org/gitlab-ce!15418
\| * \| \| \|	Move installation of apps higherdocs/refactor-cluster	Achilleas Pipinellis	2017-11-16	1	-12/+13
\| \| \| \| \|
\| * \| \| \|	Change to Google Kubernetes Cluster and add internal links	Achilleas Pipinellis	2017-11-16	1	-9/+9
\| \| \| \| \|
\| * \| \| \|	Add Ingress description from official docs	Achilleas Pipinellis	2017-11-16	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Add info on creating your own k8s cluster from the cluster page	Achilleas Pipinellis	2017-11-16	1	-21/+32
\| \| \| \| \|
\| * \| \| \|	Add info about the installed apps in the Cluster docs	Achilleas Pipinellis	2017-11-16	2	-10/+12
\| \| \| \| \|
* \| \| \| \|	Update database_debugging.md	Michael Kozono	2017-11-16	1	-4/+3
\|/ / / /
* \| \| \|	Merge branch ↵	Tim Zallmann	2017-11-16	9	-60/+96
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'37508-lock-confidential-issuable-sidebar-custom-svg-icons-iteration' into 'master' Resolve "lock/confidential issuable sidebar custom svg icons iteration" Closes #37508 See merge request gitlab-org/gitlab-ce!15372
\| * \| \| \|	Resolve "lock/confidential issuable sidebar custom svg icons iteration"	Luke "Jared" Bennett	2017-11-16	9	-60/+96
\|/ / / /
* \| \| \|	Merge branch 'bvl-isolate-fork-network-background-migrations' into 'master'	Rémy Coutable	2017-11-16	1	-11/+11
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Isolate the fork network background migrations See merge request gitlab-org/gitlab-ce!15393
\| * \| \|	Isolate the fork network background migrationsbvl-isolate-fork-network-background-migrations	Bob Van Landuyt	2017-11-15	1	-11/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before the `PopulateForkNetworksRange` spec would also call the `CreateForkNetworkMemberships` which we would count on in the spec. With this, I'm isolating that, and counting only records created in this particular migration instead.
* \| \| \|	Merge branch 'cache-user-keys-count' into 'master'	Douwe Maan	2017-11-16	13	-29/+262
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache the number of user SSH keys See merge request gitlab-org/gitlab-ce!15401
\| * \| \| \|	Cache the number of user SSH keyscache-user-keys-count	Yorick Peterse	2017-11-16	13	-29/+262
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By caching the number of personal SSH keys we reduce the number of queries necessary on pages such as ProjectsController#show (which can end up querying this data multiple times). The cache is refreshed/flushed whenever an SSH key is added, removed, or when a user is removed.
* \| \| \| \|	Merge branch 'brand_header_change' into 'master'	Annabel Dunstone Gray	2017-11-16	4	-2/+14
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a custom header logo is present, don't show GitLab type logo See merge request gitlab-org/gitlab-ce!15410
\| * \| \| \| \|	When a custom header logo is present, don't show GitLab type logo	Drew Blessing	2017-11-15	4	-2/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In the new navigation header, when a user uploads a custom header logo GitLab will still show the 'GitLab' type logo. This is often undesirable as the user may want to upload a logo with their own name present. This change will toggle the GitLab type logo if a custom header logo is present.
* \| \| \| \| \|	Merge branch 'dm-notes-actions-noteable-for-update' into 'master'	Sean McGivern	2017-11-16	4	-3/+36
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure NotesActions#noteable returns a Noteable in the update action Closes #40208 See merge request gitlab-org/gitlab-ce!15421
\| * \| \| \| \| \|	Make sure NotesActions#noteable returns a Noteable in the update actiondm-notes-actions-noteable-for-update	Douwe Maan	2017-11-16	4	-3/+36
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'winh-update-license_finder' into 'master'	Rémy Coutable	2017-11-16	3	-3/+43
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update license_finder to 3.1.1 Closes #34955 et #40020 See merge request gitlab-org/gitlab-ce!15319
\| * \| \| \| \| \|	Update license_finder to 3.1.1	Winnie Hellmann	2017-11-16	3	-3/+43
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'bvl-adjust-openid_connect_spec' into 'master'	Sean McGivern	2017-11-16	1	-2/+11
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adjust openid_connect_spec to use `raise_error` Closes #40093 See merge request gitlab-org/gitlab-ce!15420
\| * \| \| \| \| \|	Adjust openid_connect_spec to use `raise_error`	Bob Van Landuyt	2017-11-16	1	-2/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Using the `raise_error`-matcher instead of `throw_symbol` makes sure our after blocks get called in the test suite.
* \| \| \| \| \| \|	Merge branch 'backport-delete-epic' into 'master'	Filipa Lacerda	2017-11-16	8	-20/+103
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport delete epic changes Closes #40162 See merge request gitlab-org/gitlab-ce!15414
\| * \| \| \| \| \|	Backport delete epic changesbackport-delete-epic	Clement Ho	2017-11-15	8	-20/+103
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'simplify-docs-review-script' into 'master'	Rémy Coutable	2017-11-16	1	-11/+24
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change logic of repo name and slugs in docs review script See merge request gitlab-org/gitlab-ce!15395
\| * \| \| \| \| \| \|	Change logic of repo name and slugs in docs review scriptsimplify-docs-review-script	Achilleas Pipinellis	2017-11-16	1	-11/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We need to make room for Runner and Omnibus docs. This change makes sure the correct values are defined based on CI_PROJECT_NAME.
* \| \| \| \| \| \| \|	Merge branch 'fix/git-env-repo-paths' into 'master'	Douwe Maan	2017-11-16	3	-11/+51
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use relative git object paths to construct absolute ones before setting Env See merge request gitlab-org/gitlab-ce!15376
\| * \| \| \| \| \| \| \|	Use relative git object paths to construct absolute ones before setting Envfix/git-env-repo-paths	Ahmad Sherif	2017-11-14	3	-11/+51
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'docs/db-debugging' into 'master'	Yorick Peterse	2017-11-16	2	-0/+50
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add basic docs for troubleshooting database problems See merge request gitlab-org/gitlab-ce!15416
\| * \| \| \| \| \| \| \|	Add basic docs for troubleshooting database problemsdocs/db-debugging	Eric Eastwood	2017-11-15	2	-0/+50
\| \| \| \| \| \| \| \| \|