summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | Make merge_jid handling less stateful in MergeServiceOswaldo Ferreira2017-10-276-61/+18
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch '2518-saved-configuration-for-issue-board' into 'master'Phil Hughes2017-10-3016-93/+174
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [CE backport] Saved configuration for issue boardOswaldo Ferreira2017-10-3016-93/+174
|/ / / / / / / / /
* | | | | | | | | Merge branch 'bvl-fix-system-hook-project-visibility' into 'master'Sean McGivern2017-10-303-1/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use the correct project visibility in system hooksBob Van Landuyt2017-10-303-1/+12
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '39366-email-confirmation-fails' into 'master'Douwe Maan2017-10-304-1/+16
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | more readable changelog39366-email-confirmation-failsBrett Walker2017-10-281-1/+1
| * | | | | | | | remove extra whitespaceBrett Walker2017-10-271-2/+2
| * | | | | | | | use a delegate for `username` to be more future friendlyBrett Walker2017-10-273-2/+11
| * | | | | | | | add changelog entryBrett Walker2017-10-271-0/+5
| * | | | | | | | fix to pass static-analysisBrett Walker2017-10-241-2/+2
| * | | | | | | | grab the correct username when confirming secondary emailBrett Walker2017-10-231-1/+2
* | | | | | | | | Merge branch 'es-module-autosave' into 'master'Filipa Lacerda2017-10-306-27/+17
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into 'es-module-autosave'es-module-autosaveMike Greiling2017-10-24925-9504/+22685
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | remove import from main.jsMike Greiling2017-10-121-1/+0
| * | | | | | | | | | remove global exportMike Greiling2017-10-121-2/+0
| * | | | | | | | | | convert Autosave into pure es module and remove global exportMike Greiling2017-10-125-25/+18
* | | | | | | | | | | Merge branch 'docs/update-create-mr' into 'master'Marcia Ramos2017-10-274-13/+10
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Update docs on creating MRsdocs/update-create-mrAchilleas Pipinellis2017-10-214-13/+10
* | | | | | | | | | | Merge branch 'use-git-branch-merged' into 'master'Rémy Coutable2017-10-2710-9/+121
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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 modelZeger-Jan van de Weg2017-10-278-21/+61
* | | | | | | | | | | | 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_slugAhmad Sherif2017-10-271-1/+10
* | | | | | | | | | | | | Merge branch 'add-user-avatar-username-link' into 'master'Fatih Acet2017-10-272-3/+65
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add KubernetesService#default_namespace testsac-k8s-namespace-validatorAlessio Caiazza2017-10-262-14/+24
| * | | | | | | | | | | | | | Remove duped testsAlessio Caiazza2017-10-261-28/+0
| * | | | | | | | | | | | | | namespace should be lowercased in kubernetes. This is also true for the scena...Mircea Danila Dumitrescu2017-10-042-1/+17
* | | | | | | | | | | | | | | 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'"39441-bring-edit-form-backSean McGivern2017-10-2610-28/+246
* | | | | | | | | | | | | | | Merge branch '39188-change-default-disabled-merge-message' into 'master'Filipa Lacerda2017-10-273-2/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Change default disabled merge request widget message to "Merge is not allowed...39188-change-default-disabled-merge-messageEric Eastwood2017-10-273-2/+54
* | | | | | | | | | | | | | | | Merge branch 'patch-29' into 'master'Sean McGivern2017-10-271-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Semi-linear history merge is now available in CE.Nick Brown2017-10-271-1/+0
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch '38869-groups-select' into 'master'Phil Hughes2017-10-274-114/+78
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | 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 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 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 clarif...Andrew Davis2017-10-261-4/+7
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |