summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix misaligned buttons in wiki pages31704-misaligned-buttons-in-wiki-pagesAchilleas Pipinellis2017-05-022-1/+4
* Merge branch 'docs-mrs-should-run-static-analysis' into 'master' Achilleas Pipinellis2017-05-021-22/+18
|\
| * DRY the `<<: *except-docs` a bit in `.gitlab-ci.yml`docs-mrs-should-run-static-analysisRémy Coutable2017-05-021-21/+18
| * Make the static-analysis job be run for docs branches tooRémy Coutable2017-05-021-1/+0
* | Merge branch 'revert-f2fc716c' into 'master' Rémy Coutable2017-05-021-12/+12
|\ \
| * | Revert "Shorten and improve some job names"Douwe Maan2017-05-021-12/+12
* | | Merge branch 'dm-snippet-download-button' into 'master' Sean McGivern2017-05-0211-111/+133
|\ \ \ | |/ / |/| |
| * | Add download_snippet_path helperDouwe Maan2017-05-023-5/+13
| * | Add download button to project snippetsdm-snippet-download-buttonDouwe Maan2017-04-3011-115/+129
* | | Merge branch '12910-personal-snippets-notes-show' into 'master' Sean McGivern2017-05-0228-235/+703
|\ \ \ | |_|/ |/| |
| * | Display comments for personal snippets12910-personal-snippets-notes-showJarka Kadlecova2017-05-0228-235/+703
* | | Merge branch 'patch-20' into 'master' Rémy Coutable2017-05-021-1/+1
|\ \ \
| * | | use TCP or HTTPS protocol for port 443 on load balancerBen Bodenmiller2017-04-271-1/+1
* | | | Merge branch '29036-use-slack-service-to-notify-of-failed-pipelines' into 'ma...Robert Speicher2017-05-022-29/+0
|\ \ \ \
| * | | | Remove notify slack job29036-use-slack-service-to-notify-of-failed-pipelinesZeger-Jan van de Weg2017-05-012-29/+0
* | | | | Merge branch 'gitaly-branch-tag-count' into 'master' Sean McGivern2017-05-026-28/+47
|\ \ \ \ \
| * | | | | Cleanupgitaly-branch-tag-countKim "BKC" Carlbäcker2017-04-282-3/+6
| * | | | | Fix RSpecKim "BKC" Carlbäcker2017-04-281-13/+1
| * | | | | Use Gitaly for getting Branch/Tag countsKim "BKC" Carlbäcker2017-04-286-15/+43
* | | | | | Merge branch '31254-change-git-commit-command-in-existing-folder' into 'master' Rémy Coutable2017-05-022-1/+5
|\ \ \ \ \ \
| * | | | | | [#31254] Change Git commit command in "Existing folder" to git commit -mTM Lee2017-04-302-1/+5
* | | | | | | Merge branch 'patch-19' into 'master' Rémy Coutable2017-05-021-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Gitlab -> GitLabBen Bodenmiller2017-04-271-2/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'pdf-test-fix' into 'master' Sean McGivern2017-05-021-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fixed PDF blob specsPhil Hughes2017-05-021-1/+1
* | | | | | | | Merge branch '19364-webhook-edit' into 'master' Dmitriy Zaporozhets2017-05-0218-170/+372
|\ \ \ \ \ \ \ \
| * | | | | | | | Implement ability to update hooksAlexander Randa2017-04-2818-170/+372
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch '26488-target-disabled-mr' into 'master' Sean McGivern2017-05-0212-4/+111
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix 404 when upstream has disabled merge requestsmhasbini2017-04-2712-4/+111
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'wabernat1/gitlab-ce-patch-14' into 'master' 31515-navigation-menu-bugs-on-the-contribution-analytics-pageSean Packham (GitLab)2017-05-022-16/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | Update docs on creating a projectAchilleas Pipinellis2017-05-022-16/+20
* | | | | | | | | Merge branch 'menway/gitlab-ce-patch-15' into 'master' Sean Packham (GitLab)2017-05-024-0/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Change to correct directory in update instructionsmenway/gitlab-ce-patch-15menway2017-04-274-0/+8
* | | | | | | | | Merge branch 'add-tanuki-ci-status-favicons' into 'master' Sean McGivern2017-05-0223-1/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ci skip] Added changelog entryLuke "Jared" Bennett2017-05-021-0/+4
| * | | | | | | | | Renamed notfound favicon nameadd-tanuki-ci-status-faviconsLuke "Jared" Bennett2017-05-013-0/+0
| * | | | | | | | | added not-found status faviconsDimitrie Hoekstra2017-05-012-0/+0
| * | | | | | | | | Added testLuke "Jared" Bennett2017-04-251-0/+6
| * | | | | | | | | updated to new faviconsLuke "Jared" Bennett2017-04-2519-1/+4
* | | | | | | | | | Merge branch '30535-display-whether-pages-is-enabled-in-the-admin-dashboard' ...Rémy Coutable2017-05-022-0/+10
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Display GitLab Pages status in Admin DashboardMark Fletcher2017-05-012-0/+10
* | | | | | | | | | Merge branch '20830-getting-started-better-explore-groups-view' into 'master' Phil Hughes2017-05-0212-48/+335
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Better Explore Groups viewLuke "Jared" Bennett2017-05-0212-48/+335
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'pdflab-in-repo' into 'master' Phil Hughes2017-05-0217-15/+327
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Move PDFLab into GitLabpdflab-in-repoSam Rose2017-04-2817-15/+327
* | | | | | | | | | Merge branch 'zj-upgrade-carrierwave' into 'master' Douwe Maan2017-05-017-26/+29
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update Carrierwave and fog-coreZeger-Jan van de Weg2017-05-017-26/+29
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'fix/add-specs-for-request-profiler' into 'master' Douwe Maan2017-05-013-0/+140
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add specs for Gitlab::RequestProfilerAhmad Sherif2017-05-013-0/+140
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'dont-blow-up-when-email-has-no-references-header' into 'master' Douwe Maan2017-05-013-1/+16
|\ \ \ \ \ \ \ \ \ \