summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Make `#hashed_storage?` require feature argument3674-hashed-storage-attachmentsGabriel Mazetto2017-10-314-19/+14
|
* Code Style changes and `hashed_storage?` now receives optional featureGabriel Mazetto2017-10-314-26/+40
|
* ChangelogGabriel Mazetto2017-10-301-0/+5
|
* Document existing storable objects and their status regarding Hashed storageGabriel Mazetto2017-10-301-1/+24
|
* Use the Hashed Storage compatible layer to store AttachmentsGabriel Mazetto2017-10-302-14/+40
|
* Moved renaming operations to storage layer abstractionGabriel Mazetto2017-10-274-13/+76
| | | | | When project storage_version is `2` means attachments are using hashed storage.
* Merge branch 'use-git-branch-merged' into 'master'Rémy Coutable2017-10-2710-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 onceLin Jen-Shin (godfat)2017-10-2710-9/+121
|/
* Merge branch 'docs-update-ee_features.md-ce' into 'master'Rémy Coutable2017-10-271-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-ceLin Jen-Shin2017-10-271-0/+382
|/
* Merge branch 'zj-commit-cache' into 'master'Sean McGivern2017-10-278-21/+61
|\ | | | | | | | | Cache commits on the repository model See merge request gitlab-org/gitlab-ce!14863
| * Cache commits on the repository modelZeger-Jan van de Weg2017-10-278-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 McGivern2017-10-271-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_slugAhmad Sherif2017-10-271-1/+10
| | |
* | | Merge branch 'add-user-avatar-username-link' into 'master'Fatih Acet2017-10-272-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-linkClement Ho2017-10-271-4/+0
| | | |
| * | | Improve spec to check hidden componentClement Ho2017-10-271-2/+6
| | | |
| * | | Rename to shouldShowUsernameClement Ho2017-10-271-3/+3
| | | |
| * | | Add configurable option to display username in user avatar link componentClement Ho2017-10-182-3/+65
| | | |
* | | | Merge branch 'ac-k8s-namespace-validator' into 'master'Rémy Coutable2017-10-273-26/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sanitize k8s default_namespace Closes #38692 See merge request gitlab-org/gitlab-ce!15053
| * | | | Add KubernetesService#default_namespace testsac-k8s-namespace-validatorAlessio Caiazza2017-10-262-14/+24
| | | | |
| * | | | Remove duped testsAlessio Caiazza2017-10-261-28/+0
| | | | | | | | | | | | | | | | | | | | Likely caused by EE conflicts resolution
| * | | | namespace should be lowercased in kubernetes. This is also true for the ↵Mircea Danila Dumitrescu2017-10-042-1/+17
| | | | | | | | | | | | | | | | | | | | scenario where the namespace is generated from the project group-name.
* | | | | Merge branch '39441-bring-edit-form-back' into 'master'Rémy Coutable2017-10-2710-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-backSean McGivern2017-10-2610-28/+246
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 915e35a2992a4e51db2ac32aac8d7a29b1f4449e, reversing changes made to 9533786f522e358f372d8a0ec4b4990ae9d88f37.
* | | | | | Merge branch '39188-change-default-disabled-merge-message' into 'master'Filipa Lacerda2017-10-273-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-messageEric Eastwood2017-10-273-2/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allowed yet" Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39188
* | | | | | | Merge branch 'patch-29' into 'master'Sean McGivern2017-10-271-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 Brown2017-10-271-1/+0
| |/ / / / / / | | | | | | | | | | | | | | Already mentioned in the list above this one.
* | | | | | | Merge branch '38869-groups-select' into 'master'Phil Hughes2017-10-274-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 codeFilipa Lacerda2017-10-274-114/+78
|/ / / / / /
* | | | | | Merge branch '39495-fix-bitbucket-login' into 'master'Rémy Coutable2017-10-272-0/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bitbucket login Closes #39495 See merge request gitlab-org/gitlab-ce!15051
| * | | | | | Fix bitbucket login39495-fix-bitbucket-loginJarka Kadlecova2017-10-262-0/+9
| | | | | | |
* | | | | | | Merge branch 'patch-29' into 'master'Achilleas Pipinellis2017-10-271-2/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken table of content links Closes #39471 See merge request gitlab-org/gitlab-ce!15034
| * | | | | | Fix broken table of content linksNiek Nijland2017-10-251-2/+2
| | | | | | |
* | | | | | | Merge branch 'patch-30' into 'master'Douwe Maan2017-10-261-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 Davis2017-10-261-4/+7
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | clarify that this will NOT add users to GitLab Groups.
* | | | | | | Merge branch 'an/local_branches_opt_out' into 'master'Douwe Maan2017-10-261-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make local_branches OPT_OUT See merge request gitlab-org/gitlab-ce!15045
| * | | | | | | Make local_branches OPT_OUTan/local_branches_opt_outAndrew Newdigate2017-10-261-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'fix/add-path-attr-to-wiki-file' into 'master'Sean McGivern2017-10-263-4/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add path attribute to WikiFile class Closes #39420 See merge request gitlab-org/gitlab-ce!15019
| * | | | | | | Add path attribute to WikiFile classAhmad Sherif2017-10-263-4/+14
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Fixes #39420
* | | | | | | Merge branch 'gl-username-hook-fix' into 'master'Douwe Maan2017-10-262-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-fixAlejandro Rodríguez2017-10-252-14/+16
| |/ / / / / /
* | | | | | | Merge branch 'non-existing-repo-optimization' into 'master'Douwe Maan2017-10-262-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-optimizationAlejandro Rodríguez2017-10-202-8/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This saves us Rugged/gRPC invocations
* | | | | | | | Merge branch 'api-configure-jira' into 'master'Douwe Maan2017-10-267-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-jiraRobert Schilling2017-10-241-0/+2
| | | | | | | |
| * | | | | | | Factories need to set required attributesRobert Schilling2017-10-241-0/+2
| | | | | | | |
| * | | | | | | Update API docsRobert Schilling2017-10-242-3/+3
| | | | | | | |
| * | | | | | | Validate username/pw for Jiraservice, require them in the APIRobert Schilling2017-10-244-2/+23
| | | | | | | |
View Lorry Controller Status