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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merging EE doc into CEdocs-update-ee_features.md-ce	Lin Jen-Shin	2017-10-27	1	-0/+382
\|
*	Merge branch 'zj-commit-cache' into 'master'	Sean McGivern	2017-10-27	8	-21/+61
\|\ \| \| \| \| \| \| \| \|	Cache commits on the repository model See merge request gitlab-org/gitlab-ce!14863
\| *	Cache commits on the repository model	Zeger-Jan van de Weg	2017-10-27	8	-21/+61
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now, when requesting a commit from the Repository model, the results are not cached. This means we're fetching the same commit by oid multiple times during the same request. To prevent us from doing this, we now cache results. Caching is done only based on object id (aka SHA). Given we cache on the Repository model, results are scoped to the associated project, eventhough the change of two repositories having the same oids for different commits is small.
* \|	Merge branch 'fix/avoid-using-rugged-in-wiki-preview-slug' into 'master'	Sean McGivern	2017-10-27	1	-1/+10
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Avoid using Rugged in Gitlab::Git::Wiki#preview_slug See merge request gitlab-org/gitlab-ce!15054
\| * \|	Avoid using Rugged in Gitlab::Git::Wiki#preview_slug	Ahmad Sherif	2017-10-27	1	-1/+10
\| \| \|
* \| \|	Merge branch 'add-user-avatar-username-link' into 'master'	Fatih Acet	2017-10-27	2	-3/+65
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add configurable option to display username in user avatar link component See merge request gitlab-org/gitlab-ce!14902
\| * \| \|	Remove repetitive karma specadd-user-avatar-username-link	Clement Ho	2017-10-27	1	-4/+0
\| \| \| \|
\| * \| \|	Improve spec to check hidden component	Clement Ho	2017-10-27	1	-2/+6
\| \| \| \|
\| * \| \|	Rename to shouldShowUsername	Clement Ho	2017-10-27	1	-3/+3
\| \| \| \|
\| * \| \|	Add configurable option to display username in user avatar link component	Clement Ho	2017-10-18	2	-3/+65
\| \| \| \|
* \| \| \|	Merge branch 'ac-k8s-namespace-validator' into 'master'	Rémy Coutable	2017-10-27	3	-26/+24
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sanitize k8s default_namespace Closes #38692 See merge request gitlab-org/gitlab-ce!15053
\| * \| \| \|	Add KubernetesService#default_namespace testsac-k8s-namespace-validator	Alessio Caiazza	2017-10-26	2	-14/+24
\| \| \| \| \|
\| * \| \| \|	Remove duped tests	Alessio Caiazza	2017-10-26	1	-28/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Likely caused by EE conflicts resolution
\| * \| \| \|	namespace should be lowercased in kubernetes. This is also true for the ↵	Mircea Danila Dumitrescu	2017-10-04	2	-1/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	scenario where the namespace is generated from the project group-name.
* \| \| \| \|	Merge branch '39441-bring-edit-form-back' into 'master'	Rémy Coutable	2017-10-27	10	-28/+246
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch '36670-remove-edit-form' into 'master'" Closes #39441 See merge request gitlab-org/gitlab-ce!15049
\| * \| \| \| \|	Revert "Merge branch '36670-remove-edit-form' into 'master'"39441-bring-edit-form-back	Sean McGivern	2017-10-26	10	-28/+246
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 915e35a2992a4e51db2ac32aac8d7a29b1f4449e, reversing changes made to 9533786f522e358f372d8a0ec4b4990ae9d88f37.
* \| \| \| \| \|	Merge branch '39188-change-default-disabled-merge-message' into 'master'	Filipa Lacerda	2017-10-27	3	-2/+54
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change default disabled merge request widget message to be more general Closes #39188 See merge request gitlab-org/gitlab-ce!14960
\| * \| \| \| \| \|	Change default disabled merge request widget message to "Merge is not ↵39188-change-default-disabled-merge-message	Eric Eastwood	2017-10-27	3	-2/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	allowed yet" Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39188
* \| \| \| \| \| \|	Merge branch 'patch-29' into 'master'	Sean McGivern	2017-10-27	1	-1/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Semi-linear history merge is now available in CE. See merge request gitlab-org/gitlab-ce!15059
\| * \| \| \| \| \| \|	Semi-linear history merge is now available in CE.	Nick Brown	2017-10-27	1	-1/+0
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Already mentioned in the list above this one.
* \| \| \| \| \| \|	Merge branch '38869-groups-select' into 'master'	Phil Hughes	2017-10-27	4	-114/+78
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove groups_select from global namespace & simplifies the code See merge request gitlab-org/gitlab-ce!15008
\| * \| \| \| \| \|	Remove groups_select from global namespace & simplifies the code	Filipa Lacerda	2017-10-27	4	-114/+78
\|/ / / / / /
* \| \| \| \| \|	Merge branch '39495-fix-bitbucket-login' into 'master'	Rémy Coutable	2017-10-27	2	-0/+9
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bitbucket login Closes #39495 See merge request gitlab-org/gitlab-ce!15051
\| * \| \| \| \| \|	Fix bitbucket login39495-fix-bitbucket-login	Jarka Kadlecova	2017-10-26	2	-0/+9
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'patch-29' into 'master'	Achilleas Pipinellis	2017-10-27	1	-2/+2
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken table of content links Closes #39471 See merge request gitlab-org/gitlab-ce!15034
\| * \| \| \| \| \|	Fix broken table of content links	Niek Nijland	2017-10-25	1	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'patch-30' into 'master'	Douwe Maan	2017-10-26	1	-4/+7
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify the language around External Group membership with SAML SSO to clarify… See merge request gitlab-org/gitlab-ce!15042
\| * \| \| \| \| \| \|	Clarify the language around External Group membership with SAML SSO to ↵	Andrew Davis	2017-10-26	1	-4/+7
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	clarify that this will NOT add users to GitLab Groups.
* \| \| \| \| \| \|	Merge branch 'an/local_branches_opt_out' into 'master'	Douwe Maan	2017-10-26	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make local_branches OPT_OUT See merge request gitlab-org/gitlab-ce!15045
\| * \| \| \| \| \| \|	Make local_branches OPT_OUTan/local_branches_opt_out	Andrew Newdigate	2017-10-26	1	-1/+1
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'fix/add-path-attr-to-wiki-file' into 'master'	Sean McGivern	2017-10-26	3	-4/+14
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add path attribute to WikiFile class Closes #39420 See merge request gitlab-org/gitlab-ce!15019
\| * \| \| \| \| \| \|	Add path attribute to WikiFile class	Ahmad Sherif	2017-10-26	3	-4/+14
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #39420
* \| \| \| \| \| \|	Merge branch 'gl-username-hook-fix' into 'master'	Douwe Maan	2017-10-26	2	-14/+16
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the incorrect value being used to set GL_USERNAME on hooks See merge request gitlab-org/gitlab-ce!15038
\| * \| \| \| \| \| \|	Fix the incorrect value being used to set GL_USERNAME on hooksgl-username-hook-fix	Alejandro Rodríguez	2017-10-25	2	-14/+16
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'non-existing-repo-optimization' into 'master'	Douwe Maan	2017-10-26	2	-8/+35
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid calling underlying methods on non-existing repos See merge request gitlab-org/gitlab-ce!14962
\| * \| \| \| \| \| \|	Avoid calling underlying methods on non-existing reposnon-existing-repo-optimization	Alejandro Rodríguez	2017-10-20	2	-8/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This saves us Rugged/gRPC invocations
* \| \| \| \| \| \| \|	Merge branch 'api-configure-jira' into 'master'	Douwe Maan	2017-10-26	7	-4/+29
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Validate username/pw for Jiraservice, require them in the API Closes #36621 See merge request gitlab-org/gitlab-ce!15025
\| * \| \| \| \| \| \|	Update factories for git push serviceapi-configure-jira	Robert Schilling	2017-10-24	1	-0/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Factories need to set required attributes	Robert Schilling	2017-10-24	1	-0/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Update API docs	Robert Schilling	2017-10-24	2	-3/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Validate username/pw for Jiraservice, require them in the API	Robert Schilling	2017-10-24	4	-2/+23
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'feature/ssh_host_fingerprint' into 'master'	Sean McGivern	2017-10-26	16	-4/+411
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatic configuration settings page Closes #25142 See merge request gitlab-org/gitlab-ce!13850
\| * \| \| \| \| \| \|	Added ssh fingerprint, gitlab ci and pages information in an instance ↵	Francisco Lopez	2017-10-25	16	-4/+411
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	configuration page Closes #25142
* \| \| \| \| \| \|	Merge branch '38178-fl-mr-notes-components' into 'master'	Phil Hughes	2017-10-25	10	-39/+94
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moves placeholders components into shared folder with documentation. See merge request gitlab-org/gitlab-ce!14964
\| * \| \| \| \| \| \|	Moves placeholders components into shared folder with documentation. Makes ↵38178-fl-mr-notes-components	Filipa Lacerda	2017-10-19	10	-39/+94
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	them easier to reuse in MR and Snippets comments
* \| \| \| \| \| \|	Merge branch 'gitaly-ff-merge-preparation' into 'master'	Rémy Coutable	2017-10-25	4	-18/+68
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move all rugged operation for ff_merge inside Gitlab::Git Closes gitaly#683 See merge request gitlab-org/gitlab-ce!15011
\| * \| \| \| \| \| \|	Move all rugged operation for ff_merge inside Gitlab::Gitgitaly-ff-merge-preparation	Alejandro Rodríguez	2017-10-24	4	-18/+68
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We also delete some unused code related to the aforementioned feature.
* \| \| \| \| \| \|	Merge branch '35199-case-insensitive-branches-search' into 'master'	Sean McGivern	2017-10-25	3	-1/+15
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add case insensitive branches search Closes #35199 See merge request gitlab-org/gitlab-ce!14995
\| * \| \| \| \| \| \|	Add case insensitive branches search	George Andrinopoulos	2017-10-23	3	-1/+15
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '39419-remove-overzealous-tooltips-in-projects-page-tabs' into ↵	Sean McGivern	2017-10-25	2	-3/+8
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Remove overzealous tooltips in projects page tabs" Closes #39419 See merge request gitlab-org/gitlab-ce!15017