summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Clarify usage of Runner limit and AWS tagsdocs/runner-aws-spot-instancesAchilleas Pipinellis2017-11-151-4/+6
|
* Finish rest of the sectionsAchilleas Pipinellis2017-11-151-56/+147
|
* Finish all sections except docker.machineAchilleas Pipinellis2017-11-141-14/+44
|
* Add runners.cache sectionAchilleas Pipinellis2017-11-141-72/+90
|
* Add Runner registration infoAchilleas Pipinellis2017-11-131-5/+89
|
* Clear up sectionsAchilleas Pipinellis2017-11-131-20/+53
|
* Add skeletonAchilleas Pipinellis2017-11-102-1/+115
|
* Add article on autoscaling GitLab Runner on AWSAchilleas Pipinellis2017-11-101-0/+15
|
* Merge branch 'mk-add-security-fixes-to-changelog-master' into 'master'Stan Hu2017-11-092-5/+6
|\ | | | | | | | | Add 10.1.2 security fixes to CHANGELOG on master See merge request gitlab-org/gitlab-ce!15305
| * Merge branch 'mk-add-security-fixes-to-changelog-10-1-stable' into '10-1-stable'Stan Hu2017-11-091-0/+2
| | | | | | | | | | Add 10.1.2 security fixes to CHANGELOG.md See merge request gitlab-org/gitlab-ce!15302
| * Update CHANGELOG.md for 10.1.2Lin Jen-Shin2017-11-092-5/+4
|/ | | [ci skip]
* Merge branch 'disable-issue-action-button-if-isSubmitting' into 'master'Fatih Acet2017-11-092-1/+21
|\ | | | | | | | | Disable issue action button whilst submitting and test See merge request gitlab-org/gitlab-ce!15211
| * Disable issue action button whilst submitting and testdisable-issue-action-button-if-isSubmittingLuke "Jared" Bennett2017-11-062-1/+21
| |
* | Merge branch 'br-add-glossary' into 'master'Sid Sijbrandij2017-11-091-16/+133
|\ \ | | | | | | | | | | | | add glossary part 1 See merge request gitlab-org/gitlab-ce!15247
| * | add glossary part 2br-add-glossaryBrittany Rohde2017-11-071-3/+3
| | |
| * | add glossary part 1Brittany Rohde2017-11-071-13/+130
| | |
* | | Merge branch 'move-filter-mr-clear-search-spec-to-js' into 'master'Tim Zallmann2017-11-092-16/+19
|\ \ \ | | | | | | | | | | | | | | | | Move clear search test to JS to reduce overkill See merge request gitlab-org/gitlab-ce!15154
| * | | Move clear search test to JS to reduce overkillmove-filter-mr-clear-search-spec-to-jsEric Eastwood2017-11-092-16/+19
| | | | | | | | | | | | | | | | Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/33661
* | | | Merge branch '37920-improve-breadcrumbs-clipping' into 'master'Tim Zallmann2017-11-091-4/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve breadcrumbs clipping Closes #37920 See merge request gitlab-org/gitlab-ce!15164
| * | | | Dynamically truncate breadcrumbs37920-improve-breadcrumbs-clippingAnnabel Dunstone Gray2017-11-081-3/+14
| | | | |
| * | | | Remove max-width on desktopAnnabel Dunstone Gray2017-11-081-1/+4
| | | | |
* | | | | Merge branch 'winh-subgroups-api' into 'master'Rémy Coutable2017-11-094-26/+230
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add /groups/:id/subgroups endpoint to API Closes #32652 See merge request gitlab-org/gitlab-ce!15142
| * | | | | Add /groups/:id/subgroups endpoint to APIWinnie Hellmann2017-11-094-26/+230
|/ / / / /
* | | | | Merge branch 'dm-avatarable-with-asset-host' into 'master'Rémy Coutable2017-11-098-131/+82
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Always return full avatar URL for private/internal groups/projects when asset host is set See merge request gitlab-org/gitlab-ce!15288
| * | | | | Always return full avatar URL for private/internal groups/projects when ↵Douwe Maan2017-11-098-131/+82
|/ / / / / | | | | | | | | | | | | | | | asset host is set
* | | | | Merge branch 'fix-todos-last-page' into 'master'Rémy Coutable2017-11-093-3/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix access to the final page of todos See merge request gitlab-org/gitlab-ce!15293
| * | | | | Fix access to the final page of todosSean McGivern2017-11-093-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The todos page limit is 20, and both that and a user's pending todo count are integers. Using integer division means that the result's floor will be taken, defeating the point of the later call to `#ceil`. So we need to convert one side of the division to a float first, otherwise the last page won't be treated as available.
* | | | | | Merge branch '39109-reenable-scroll-job' into 'master'Phil Hughes2017-11-092-26/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables scroll to bottom once user has scrolled back to bottom in job log Closes #34846 and #39109 See merge request gitlab-org/gitlab-ce!15260
| * | | | | | Enables scroll to bottom once user has scrolled back to bottom in job logFilipa Lacerda2017-11-092-26/+29
|/ / / / / /
* | | | | | Merge branch 'docs/support-release-tools-132' into 'master'Sean McGivern2017-11-091-15/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the new simpler `Pick into X.Y` labels workflow after the 7th See merge request gitlab-org/gitlab-ce!15282
| * | | | | | Use the new simpler `Pick into X.Y` labels workflow after the 7thRémy Coutable2017-11-091-15/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch '39895-cant-set-mattermost-username-channel-from-api' into 'master'Rémy Coutable2017-11-094-1/+33
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix acceptance of username for Mattermost service update Closes #39895 See merge request gitlab-org/gitlab-ce!15275
| * | | | | | | Fix acceptance of username for Mattermost service update via APIMark Fletcher2017-11-084-1/+33
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '39958-updatemergerequestsworker-are-failing-on-metric-tagging' ↵Sean McGivern2017-11-094-27/+29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Revert "add metrics tagging to the sidekiq middleware" Closes #39958 See merge request gitlab-org/gitlab-ce!15285
| * | | | | | | Revert "add metrics tagging to the sidekiq middleware"39958-updatemergerequestsworker-are-failing-on-metric-taggingmicael.bergeron2017-11-084-27/+29
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d5859bb9d59b3750ac6e9b8c4c17d69c4c3ed077. This reverts commit 2b7e03cf699f9d266af585a1a9399c3e219fe063. This reverts commit 7799a9bc442738935104d3b047c257e5c5884d95.
* | | | | | | Merge branch 'qa/gb/add-global-qa-scenario-arguments' into 'master'Rémy Coutable2017-11-0911-5/+128
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to define global scenario attributes Closes gitlab-qa#87 See merge request gitlab-org/gitlab-ce!15239
| * | | | | | Make it possible to define global scenario attributesGrzegorz Bizon2017-11-0911-5/+128
|/ / / / / /
* | | | | | Merge branch 'github-rake-task-rate-limiting' into 'master'Douwe Maan2017-11-093-3/+36
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add GitHub enterprise support to the GitHub Rake task and better handle rate limiting being disabled See merge request gitlab-org/gitlab-ce!15284
| * | | | | | Support importing GH projects without rate limitsgithub-rake-task-rate-limitingYorick Peterse2017-11-082-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitHub Enterprise disables rate limiting for the API, resulting in HTTP 404 errors when requesting rate limiting details. This changes Gitlab::GithubImport::Client so it can deal with rate limiting being disabled.
| * | | | | | Restore GH enterprise support in the Rake taskYorick Peterse2017-11-081-3/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | This restores GH enterprise support in the GH import Rake task.
* | | | | | Merge branch '36099-api-responses-missing-x-content-type-options-header' ↵Douwe Maan2017-11-083-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into '10-1-stable' Include X-Content-Type-Options (XCTO) header into API responses See merge request gitlab/gitlabhq!2211 (cherry picked from commit 6c818e77f2abeef2dd7b17a269611b018701fa79) e087e075 Include X-Content-Type-Options (XCTO) header into API responses
* | | | | | Merge branch 'ssrf-protections-round-2' into 'security-10-1'Douwe Maan2017-11-082-1/+19
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace SSRF resolver with Addrinfo.getaddrinfo to include alternative localhost versions See merge request gitlab/gitlabhq!2219 (cherry picked from commit 4a1e73783d5480aa514db7b53e10c075f95580b5) 1bffa0c3 Replace SSRF resolver with Addrinfo.getaddrinfo to include alternative localhost versions
* | | | | Merge branch 'fix-issues-api-list-performance' into 'master'Stan Hu2017-11-084-10/+27
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fail when issuable_meta_data is called on an unlimited collection Closes #39845 See merge request gitlab-org/gitlab-ce!15249
| * | | | | Fail when issuable_meta_data is called on an unlimited collectionfix-issues-api-list-performanceSean McGivern2017-11-074-10/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method can be called with an array, or a relation: 1. Arrays always have a limited amount of values, so that's fine. 2. If the relation does not have a limit value applied, then we will load every single object in that collection, and prevent N+1 queries for the metadata for that. But that's wrong, because we should never call this without an explicit limit set. So we raise in that case, and this commit will see which specs fail. The only failing specs here were the issues API specs, and the specs for IssuableMetadata itself, and both have been addressed.
* | | | | | Merge branch 'github-enterprise-support-importer' into 'master'Douwe Maan2017-11-083-28/+137
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Github enterprise support importer Closes #39931 See merge request gitlab-org/gitlab-ce!15281
| * | | | | | Fix the GH importer Rake taskgithub-enterprise-support-importerYorick Peterse2017-11-081-14/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This task was broken in a few areas with the removal of the old GitHub importer code.
| * | | | | | Restore Enterprise support in the GH importerYorick Peterse2017-11-082-14/+119
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | This was removed by accident as the old GitHub importer handled this deep down the codebase, making it easy to miss.
* | | | | | Merge branch 'fix/doc/39935-missing-fields-in-merge-request-payload' into ↵Achilleas Pipinellis2017-11-081-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix issue 39935 : Add created_at and updated_at fields in MR payload Closes #39935 See merge request gitlab-org/gitlab-ce!15274
| * | | | | | Fix issue 39935 : Add created_at and updated_atSébastien Le Gall2017-11-081-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add those fields to the documentation payload about merge requests that were missing but actually present when calling the endpoints
* | | | | | | Merge branch 'gitaly-700-wiki-update-page' into 'master'Douwe Maan2017-11-083-6/+46
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate GitLab::Git::Wiki.update_page to Gitaly Closes gitaly#700 See merge request gitlab-org/gitlab-ce!15268
View Lorry Controller Status