summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add changelogmake-merge-jid-handling-less-statefulOswaldo Ferreira2017-10-291-0/+5
* Make merge_jid handling less stateful in MergeServiceOswaldo Ferreira2017-10-276-61/+18
* 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
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'an/local_branches_opt_out' into 'master'Douwe Maan2017-10-261-1/+1
|\ \ \ \ \ \ \
| * | | | | | | 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 classAhmad Sherif2017-10-263-4/+14
| |/ / / / / /
* | | | | | | 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 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 reposnon-existing-repo-optimizationAlejandro Rodríguez2017-10-202-8/+35
* | | | | | | | Merge branch 'api-configure-jira' into 'master'Douwe Maan2017-10-267-4/+29
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | 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
* | | | | | | | Merge branch 'feature/ssh_host_fingerprint' into 'master'Sean McGivern2017-10-2616-4/+411
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Added ssh fingerprint, gitlab ci and pages information in an instance configu...Francisco Lopez2017-10-2516-4/+411
|/ / / / / / /
* | | | | | | Merge branch '38178-fl-mr-notes-components' into 'master'Phil Hughes2017-10-2510-39/+94
|\ \ \ \ \ \ \
| * | | | | | | Moves placeholders components into shared folder with documentation. Makes th...38178-fl-mr-notes-componentsFilipa Lacerda2017-10-1910-39/+94
| | |/ / / / / | |/| | | | |
View Lorry Controller Status