summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add fullstopadd-fullstop-auto-deploy-docsLuke Bennett2018-01-151-1/+1
* Merge branch '1819-override-ce' into 'master'Rémy Coutable2018-01-158-9/+348
|\
| * Add some more docs to doc/development/utilities.md1819-override-ceLin Jen-Shin2018-01-122-1/+49
| * Merge remote-tracking branch 'upstream/master' into 1819-override-ceLin Jen-Shin2018-01-121243-12281/+33234
| |\
| * | Skip sha_attribute if we're checking staticallyLin Jen-Shin2017-12-261-0/+1
| * | Use `Gitlab::Utils::Override` over defined?(super)Lin Jen-Shin2017-12-266-9/+299
* | | Merge branch 'docs-delete-content-articles-index' into 'master'Achilleas Pipinellis2018-01-157-77/+32
|\ \ \
| * | | Docs: deprecates articles indexMarcia Ramos2018-01-157-77/+32
|/ / /
* | | Merge branch '19493-fork-does-not-protect-default-branch' into 'master'Douwe Maan2018-01-153-4/+14
|\ \ \
| * | | Fork now protects default branch on completion19493-fork-does-not-protect-default-branchTiago Botelho2018-01-153-4/+14
* | | | Merge branch 'feature/migrate-import-repository-to-gitaly' into 'master'Robert Speicher2018-01-155-45/+96
|\ \ \ \
| * | | | Migrate importing repository to Gitalyfeature/migrate-import-repository-to-gitalyAhmad Sherif2018-01-157-47/+98
* | | | | Merge branch '41799-managed-prometheus-deployment-install-a-lot-of-extra-stuf...Kamil Trzciński2018-01-155-38/+105
|\ \ \ \ \
| * | | | | Resolve "Managed Prometheus deployment installs a lot of extra stuff"Mayra Cabrera2018-01-155-38/+105
|/ / / / /
* | | | | Merge branch 'stop-gitaly-atexit' into 'master'Rémy Coutable2018-01-152-9/+3
|\ \ \ \ \
| * | | | | Use an at_exit hook to stop test gitalystop-gitaly-atexitJacob Vosmaer2018-01-152-9/+3
* | | | | | Merge branch 'docs-fix-duplicate-sections' into 'master'Achilleas Pipinellis2018-01-151-11/+12
|\ \ \ \ \ \
| * | | | | | move sections for better doc flowMarcia Ramos2018-01-151-11/+11
| * | | | | | link to admin docMarcia Ramos2018-01-151-0/+1
* | | | | | | Merge branch '38540-ssh-env-file' into 'master'Douwe Maan2018-01-152-10/+6
|\ \ \ \ \ \ \
| * | | | | | | Remove .ssh/environment file that now breaks the gitlab:check rake taskRicketts, M (Mike)2017-12-222-10/+6
* | | | | | | | Merge branch 'projects-tree-tags-dispatcher-refactor' into 'master'Phil Hughes2018-01-153-12/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | refactored use of for projects:tree:*projects-tree-tags-dispatcher-refactorConstance Okoghenun2018-01-152-5/+3
| * | | | | | | | Refactored import of projects:tags:* and projects:tree:* of dispatcher.jsConstance Okoghenun2018-01-153-12/+33
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'feature/bump-gitaly-version-to-0-69-0' into 'master'Sean McGivern2018-01-152-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Bump Gitaly version to 0.69.0Ahmad Sherif2018-01-152-2/+2
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch '41856-backport-stacked-progress-bar' into 'master'Phil Hughes2018-01-154-0/+259
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove changelog entry41856-backport-stacked-progress-barKushal Pandya2018-01-151-5/+0
| * | | | | | | | Add changelog entryKushal Pandya2018-01-151-0/+5
| * | | | | | | | Add StackedProgressBar ComponentKushal Pandya2018-01-151-0/+1
| * | | | | | | | StackedProgressBar Component stylesKushal Pandya2018-01-151-0/+54
| * | | | | | | | StackedProgressBar Component testsKushal Pandya2018-01-151-0/+77
| * | | | | | | | StackedProgressBar ComponentKushal Pandya2018-01-151-0/+127
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'docs-move-article-undo-git' into 'master'Achilleas Pipinellis2018-01-156-498/+499
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Docs: move article "Undo possibilities in Git" into its topic-related dirMarcia Ramos2018-01-156-498/+499
|/ / / / / / /
* | | | | | | Merge branch '42025-fix-issue-api' into 'master'Sean McGivern2018-01-153-2/+18
|\ \ \ \ \ \ \
| * | | | | | | [API] Fix creating issue when assignee_id is empty42025-fix-issue-apiValery Sizov2018-01-153-2/+18
* | | | | | | | Merge branch '41970-job-play-button' into 'master'Kamil Trzciński2018-01-153-9/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove extra period41970-job-play-buttonFilipa Lacerda2018-01-121-1/+1
| * | | | | | | | Improve testsFilipa Lacerda2018-01-121-2/+6
| * | | | | | | | Sets method post for playing actionFilipa Lacerda2018-01-123-8/+12
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'docs/sast-dast' into 'master'Marcia Ramos2018-01-154-3/+137
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Add DAST to Auto DevOps docsdocs/sast-dastAchilleas Pipinellis2018-01-151-3/+34
| * | | | | | | Port the SAST DAST doc examples from EE to CEAchilleas Pipinellis2018-01-123-0/+103
* | | | | | | | Merge branch 'fix-duplication-circuit-breakers' into 'master'Douwe Maan2018-01-151-2/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Fix duplication in API::CircuitBreakersSerdar Dogruyol2018-01-151-2/+2
* | | | | | | | Merge branch 'dispatcher-projects-efi' into 'master'Phil Hughes2018-01-1510-37/+114
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into dispatcher-proj...Simon Knox2018-01-1525-108/+365
| |\ \ \ \ \ \ \
| * | | | | | | | dedupeSimon Knox2018-01-153-26/+20
| * | | | | | | | removed unneeded lint commentsdispatcher-projects-efiSimon Knox2018-01-151-2/+2