summaryrefslogtreecommitdiff
Commit message (Collapse)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
|\ | | | | | | | | Docs branches should run static analysis See merge request !11035
| * DRY the `<<: *except-docs` a bit in `.gitlab-ci.yml`docs-mrs-should-run-static-analysisRémy Coutable2017-05-021-21/+18
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Make the static-analysis job be run for docs branches tooRémy Coutable2017-05-021-1/+0
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'revert-f2fc716c' into 'master' Rémy Coutable2017-05-021-12/+12
|\ \ | | | | | | | | | | | | Revert "Shorten and improve some job names" See merge request !11037
| * | Revert "Shorten and improve some job names"Douwe Maan2017-05-021-12/+12
| | | | | | | | | This reverts commit f2fc716c4f00caf4d0184caf19c930e2d37bb6c8
* | | Merge branch 'dm-snippet-download-button' into 'master' Sean McGivern2017-05-0211-111/+133
|\ \ \ | |/ / |/| | | | | | | | Add download button to project snippets See merge request !11004
| * | 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 snippets See merge request !10974
| * | 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 balancer See merge request !10953
| * | | 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 ↵Robert Speicher2017-05-022-29/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Remove notify slack job Closes #29036 See merge request !9709
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Gitaly for getting Branch/Tag counts Closes gitaly#157 See merge request !10780
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Backup-rake-spec fixed. Storage config broken - Use rugged to compare branch/tag-count in specs - upgrade gitaly
* | | | | | 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 -m "First commit" Closes #31254 See merge request !10900
| * | | | | | [#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 -> GitLab See merge request !10952
| * | | | | | | Gitlab -> GitLabBen Bodenmiller2017-04-271-2/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'pdf-test-fix' into 'master' Sean McGivern2017-05-021-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed PDF blob specs See merge request !11025
| * | | | | | | Fixed PDF blob specsPhil Hughes2017-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PDF file is no longer included in the repo, so we need to create the PDF before running the tests
* | | | | | | | Merge branch '19364-webhook-edit' into 'master' Dmitriy Zaporozhets2017-05-0218-170/+372
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement ability to update hooks Closes #19364 See merge request !10816
| * | | | | | | | 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 disabled merge requests Closes #26488 See merge request !10427
| * | | | | | | | 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 project See merge request !10957
| * | | | | | | | 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 instructions See merge request !10958
| * | | | | | | | Change to correct directory in update instructionsmenway/gitlab-ce-patch-15menway2017-04-274-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Merge branch 'add-tanuki-ci-status-favicons' into 'master' Sean McGivern2017-05-0223-1/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updated to new favicons Closes #12818 See merge request !10923
| * | | | | | | | | [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
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Display GitLab Pages status in Admin Dashboard Closes #30535 See merge request !11007
| * | | | | | | | | 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 view Closes #20830 See merge request !7230
| * | | | | | | | | | 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 assets into repo See merge request !10642
| * | | | | | | | | 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-core See merge request !11016
| * | | | | | | | | | 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::RequestProfiler Closes #31513 See merge request !11005
| * | | | | | | | | | Add specs for Gitlab::RequestProfilerAhmad Sherif2017-05-013-0/+140
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #31513
* | | | | | | | | | Merge branch 'dont-blow-up-when-email-has-no-references-header' into 'master' Douwe Maan2017-05-013-1/+16
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't blow up when email has no References header Closes gitlab-ee#2247 See merge request !11014