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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix queried element38869-importer_status	Filipa Lacerda	2017-10-30	1	-3/+3
\|
*	Merge branch 'master' into 38869-importer_status	Filipa Lacerda	2017-10-30	144	-583/+2125
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (51 commits) Move locked check to a guard-clause Ci::Build tag is a trait instead of an own factory [CE backport] Saved configuration for issue board Use the correct project visibility in system hooks Add changelog more readable changelog Make merge_jid handling less stateful in MergeService Fetch the merged branches at once remove extra whitespace use a delegate for `username` to be more future friendly Merging EE doc into CE add changelog entry Avoid using Rugged in Gitlab::Git::Wiki#preview_slug Cache commits on the repository model Remove groups_select from global namespace & simplifies the code Change default disabled merge request widget message to "Merge is not allowed yet" Semi-linear history merge is now available in CE. Remove repetitive karma spec Improve spec to check hidden component Rename to shouldShowUsername ...
\| *	Merge branch 'zj-tag-trait-ci-build' into 'master'	Grzegorz Bizon	2017-10-30	2	-9/+9
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Ci::Build tag is a trait instead of an own factory See merge request gitlab-org/gitlab-ce!15077
\| \| *	Ci::Build tag is a trait instead of an own factory	Zeger-Jan van de Weg	2017-10-30	2	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minor annoyance of mine, and there were a couple of things wrong, for example: 1. Switching on a property is just a trait 2. It didn't inherrit from its parent Find and replace through the code based fixed all occurances.
\| * \|	Merge branch 'make-merge-jid-handling-less-stateful' into 'master'	Sean McGivern	2017-10-30	7	-60/+24
\| \|\ \ \| \| \|/ \| \|/\| \| \| \| \| \| \|	Fix widget of locked merge requests not being presented See merge request gitlab-org/gitlab-ce!15069
\| \| *	Move locked check to a guard-clause	Oswaldo Ferreira	2017-10-30	1	-1/+3
\| \| \|
\| \| *	Add changelogmake-merge-jid-handling-less-stateful	Oswaldo Ferreira	2017-10-29	1	-0/+5
\| \| \|
\| \| *	Make merge_jid handling less stateful in MergeService	Oswaldo Ferreira	2017-10-27	6	-61/+18
\| \| \|
\| * \|	Merge branch '2518-saved-configuration-for-issue-board' into 'master'	Phil Hughes	2017-10-30	16	-93/+174
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE backport] Saved configuration for issue board See merge request gitlab-org/gitlab-ce!15009
\| \| * \|	[CE backport] Saved configuration for issue board	Oswaldo Ferreira	2017-10-30	16	-93/+174
\| \|/ /
\| * \|	Merge branch 'bvl-fix-system-hook-project-visibility' into 'master'	Sean McGivern	2017-10-30	3	-1/+12
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the correct project visibility in system hooks Closes #39496 See merge request gitlab-org/gitlab-ce!15065
\| \| * \|	Use the correct project visibility in system hooks	Bob Van Landuyt	2017-10-30	3	-1/+12
\| \| \| \|
\| * \| \|	Merge branch '39366-email-confirmation-fails' into 'master'	Douwe Maan	2017-10-30	4	-1/+16
\| \|\ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	grab the correct username when confirming secondary email Closes #39366 See merge request gitlab-org/gitlab-ce!15010
\| \| * \|	more readable changelog39366-email-confirmation-fails	Brett Walker	2017-10-28	1	-1/+1
\| \| \| \|
\| \| * \|	remove extra whitespace	Brett Walker	2017-10-27	1	-2/+2
\| \| \| \|
\| \| * \|	use a delegate for `username` to be more future friendly	Brett Walker	2017-10-27	3	-2/+11
\| \| \| \|
\| \| * \|	add changelog entry	Brett Walker	2017-10-27	1	-0/+5
\| \| \| \|
\| \| * \|	fix to pass static-analysis	Brett Walker	2017-10-24	1	-2/+2
\| \| \| \|
\| \| * \|	grab the correct username when confirming secondary email	Brett Walker	2017-10-23	1	-1/+2
\| \| \| \|
\| * \| \|	Merge branch 'es-module-autosave' into 'master'	Filipa Lacerda	2017-10-30	6	-27/+17
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Autosave class from global namespace See merge request gitlab-org/gitlab-ce!14856
\| \| * \ \	Merge branch 'master' into 'es-module-autosave'es-module-autosave	Mike Greiling	2017-10-24	925	-9504/+22685
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/assets/javascripts/issuable_form.js # app/assets/javascripts/notes.js
\| \| * \| \| \|	remove import from main.js	Mike Greiling	2017-10-12	1	-1/+0
\| \| \| \| \| \|
\| \| * \| \| \|	remove global export	Mike Greiling	2017-10-12	1	-2/+0
\| \| \| \| \| \|
\| \| * \| \| \|	convert Autosave into pure es module and remove global export	Mike Greiling	2017-10-12	5	-25/+18
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'docs/update-create-mr' into 'master'	Marcia Ramos	2017-10-27	4	-13/+10
\| \|\ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update docs on creating MRs See merge request gitlab-org/gitlab-ce!14982
\| \| * \| \| \|	Update docs on creating MRsdocs/update-create-mr	Achilleas Pipinellis	2017-10-21	4	-13/+10
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'use-git-branch-merged' into 'master'	Rémy Coutable	2017-10-27	10	-9/+121
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fetch the merged branches at once. Checking it one by one in the view. We don't cache this yet because this would already much improve the performance. A naive test against a particularly large repository: ``` ruby begin now = Time.now branches.map{ \|b\| r.merged_to_root_ref?(b.name) } Time.now - now end # 8.265830782 ``` Around 10 times faster: ``` ruby begin now = Time.now r.merged_branches(branches.map(&:name)) Time.now - now end # 0.807405397 ``` This should make the branches page usable. See merge request gitlab-org/gitlab-ce!14729
\| \| * \| \| \| \|	Fetch the merged branches at once	Lin Jen-Shin (godfat)	2017-10-27	10	-9/+121
\| \|/ / / / /
\| * \| \| \| \|	Merge branch 'docs-update-ee_features.md-ce' into 'master'	Rémy Coutable	2017-10-27	1	-0/+382
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move doc/development/ee_features.md to CE See merge request gitlab-org/gitlab-ce!15066
\| \| * \| \| \| \|	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