summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | Merge branch 'am-fix-pagination-relative-links' into 'master'Rémy Coutable2019-02-255-154/+109
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly implement API pagination headers and add specs Closes #57684 See merge request gitlab-org/gitlab-ce!25267
| * | | | | | | | | | | | | Properly implement API pagination headers and add specsAdam Mulvany2019-02-215-154/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | Merge branch 'filter-confidential-issues' into 'master'Kamil Trzciński2019-02-2517-5/+145
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ability to filter confidential issues Closes #50747 See merge request gitlab-org/gitlab-ce!24960
| * | | | | | | | | | | | | | Only use boolean parameters internallyRobert Schilling2019-02-225-19/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use internally only boolean params.
| * | | | | | | | | | | | | | Add confidential_only scop to issue modelRobert Schilling2019-02-213-9/+13
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add API support for filtering confidential issuesRobert Schilling2019-02-213-0/+53
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add specs for filtering confidential issuesRobert Schilling2019-02-212-1/+36
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Ability to filter confidential issuesRobert Schilling2019-02-2111-3/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new search bar filter for confidential issues. Add filtering support to the IssuesFinder.
* | | | | | | | | | | | | | | Merge branch '49449-add-an-api-endpoint-for-bulk-updating-issues-and-mrs' ↵Rémy Coutable2019-02-256-0/+273
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' API endpoint for bulk updating issues and MRs Closes #49449 See merge request gitlab-org/gitlab-ce!25201
| * | | | | | | | | | | | | | | Incorporate review feedbackRobert Schilling2019-02-184-106/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use shared examples for issues and merge requests rather than a loop creating common specs.
| * | | | | | | | | | | | | | | Add new to test bulk_update endpoint for issues and MRsRobert Schilling2019-02-145-5/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation for issues and MRs. Add shared tests for both bulk updating issues and MRs.
| * | | | | | | | | | | | | | | API: Bulk update for issues and merge requestsRobert Schilling2019-02-143-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR adds support for bulk update actions for issues and merge requests. A single API call can be used to update a list of issues or merge requests
* | | | | | | | | | | | | | | | Merge branch 'fix-misspellings-app-comments' into 'master'Rémy Coutable2019-02-2520-24/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix misspellings in app/spec comments See merge request gitlab-org/gitlab-ce!25517
| * | | | | | | | | | | | | | | | Fix misspellings in app/spec commentsTakuya Noguchi2019-02-2520-24/+24
| | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | | | | | | | | | | | Merge branch 'sh-fix-cpp-templates-404' into 'master'Nick Thomas2019-02-253-1/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 404s when C++ .gitignore template selected Closes #57857 See merge request gitlab-org/gitlab-ce!25416
| * | | | | | | | | | | | | | | | Fix 404s when C++ .gitignore template selectedStan Hu2019-02-223-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a overly-stringent regex, the project template API was 404'ing when C++ was requested as the template. Loosen the regex to allow `+` and `%` for URL-encoded characters. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57857
* | | | | | | | | | | | | | | | | Merge branch 'update-gitlab-runner-helm-chart-to-0-2-0' into 'master'Kamil Trzciński2019-02-253-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update GitLab Runner Helm Chart to 0.2.0 See merge request gitlab-org/gitlab-ce!25493
| * | | | | | | | | | | | | | | | | Update GitLab Runner Helm Chart to 0.2.0Tomasz Maczukin2019-02-223-3/+8
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'design-management-vue-app-ce' into 'master'Filipa Lacerda2019-02-253-10/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port design-management-vue-app to CE See merge request gitlab-org/gitlab-ce!25494
| * | | | | | | | | | | | | | | | | | Port design-management-vue-app to CEPhil Hughes2019-02-223-10/+36
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'sh-fix-double-xhr-pipelines' into 'master'Filipa Lacerda2019-02-254-5/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate XHR request when requesting new pipeline page Closes #58095 See merge request gitlab-org/gitlab-ce!25506
| * | | | | | | | | | | | | | | | | | Remove duplicate XHR request when requesting new pipeline pageStan Hu2019-02-234-5/+55
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a user clicked on another page in the pipeline page, the following would happen: 1. PipelinesService.getPipelines() would be called to fetch the new page 2. In the success handler, Poll.restart() would be called 3. This would invoke Poll.makeRequest(), which would fire off a new request. To fix this, we introduce a enable(), which will: 1. Update the request data accordingly 2. Clear the old timeout if necessary and start a new timer Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58095
* | | | | | | | | | | | | | | | | | Merge branch '57785-create-project-template-for-netlify' into 'master'Kushal Pandya2019-02-2510-2/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project Templates for Netlify Closes #57785 See merge request gitlab-org/gitlab-ce!25453
| * | | | | | | | | | | | | | | | | | Merge branch '57785-create-project-template-for-netlify' of ↵Jason Lenny2019-02-2510-2/+52
|/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce into 57785-create-project-template-for-netlify
* | | | | | | | | | | | | | | | | | Merge branch 'sh-fix-issue-58103' into 'master'Grzegorz Bizon2019-02-253-1/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly handle multiple X-Forwarded-For addresses in runner IP Closes #58103 See merge request gitlab-org/gitlab-ce!25511
| * | | | | | | | | | | | | | | | | Properly handle multiple X-Forwarded-For addresses in runner IPStan Hu2019-02-243-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24624 extracted the X-Forwarded-For address directly, but this didn't consider the case where multiple proxies are in the chain. To fix this, we use the Rails implementation to filter trusted proxies, as documented by Grape: https://github.com/ruby-grape/grape#remote-ip Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58103
* | | | | | | | | | | | | | | | | | Merge branch 'docs-fix-misspellings' into 'master'Evan Read2019-02-2514-15/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs: Fix misspellings in docs See merge request gitlab-org/gitlab-ce!25505
| * | | | | | | | | | | | | | | | | | Fix misspellings in docsTakuya Noguchi2019-02-2514-15/+15
|/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | | | | | | | | | | | | | Merge branch 'winh-remove-convertPermissionToBoolean' into 'master'Clement Ho2019-02-252-22/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove convertPermissionToBoolean() from common_utils.js See merge request gitlab-org/gitlab-ce!25454
| * | | | | | | | | | | | | | | | | | Remove convertPermissionToBoolean() from common_utils.jsWinnie Hellmann2019-02-212-22/+0
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'fix-badges-logs' into 'master'Evan Read2019-02-242-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: fix url of pipeline status badge See merge request gitlab-org/gitlab-ce!25404
| * | | | | | | | | | | | | | | | | | | Docs: fix url of pipeline status badgeAviad Levy2019-02-242-1/+6
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch 'jl-update-ruby-2-5-docs' into 'master'Evan Read2019-02-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update minimum ruby version to 2.5. See merge request gitlab-org/gitlab-ce!25496
| * | | | | | | | | | | | | | | | | | Update minimum ruby version to 2.5.Joshua Lambert2019-02-241-1/+1
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch '54924-refactor-notes-actions-params' into 'master'Lin Jen-Shin2019-02-235-37/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor params for NotesActions Closes #54924 See merge request gitlab-org/gitlab-ce!25278
| * | | | | | | | | | | | | | | | | | Refactor params for notes_actionsHeinrich Lee Yu2019-02-235-37/+52
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes unneeded params from permitted list This also fixes commenting on commits with a hash starting with a large number
* | | | | | | | | | | | | | | | | | Merge branch 'docs-serverless-updates' into 'master'Sid Sijbrandij2019-02-227-43/+114
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs serverless updates See merge request gitlab-org/gitlab-ce!25497
| * | | | | | | | | | | | | | | | | | Update obtaining url for serverless appsdanielgruesso2019-02-223-8/+15
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Update adding existing clusterdanielgruesso2019-02-221-13/+13
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Update adding existing clusterdanielgruesso2019-02-221-24/+74
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'docs-serverless-updates' of gitlab.com:gitlab-org/gitlab-ce ↵danielgruesso2019-02-222-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into docs-serverless-updates
| | * | | | | | | | | | | | | | | | | | Edits to serverless docMike Lewis2019-02-221-4/+4
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Minor edits to tillerMike Lewis2019-02-221-2/+2
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Add improved imagesdanielgruesso2019-02-222-0/+0
| |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Replace deprecated method to create clusteroledanielgruesso2019-02-221-4/+10
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Replace 2 images with better quality onesDaniel Gruesso2019-02-222-0/+0
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Update steps for clarityDaniel Gruesso2019-02-221-6/+14
| | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch ↵Douglas Barbosa Alexandre2019-02-222-10/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '58062-tracing-url-template-render-using-string-format-does-not-play-well-with-urls' into 'master' Switch back to using regexps in tracing_url_template Closes #58062 See merge request gitlab-org/gitlab-ce!25491
| * | | | | | | | | | | | | | | | | Switch back to using regexps in `tracing_url_template`Andrew Newdigate2019-02-222-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This approach is able to cope with `%` characters in the URL template, which is important since `%` is a valid URL character. Additionally this approach is less likely to fail on an invalid string. This is important since the distributed tracing infrastructure is designed to degrade gracefully when not properly configured, and a small mistake in the configuration of the URL template could have led to a production outage.
| * | | | | | | | | | | | | | | | | Add test for URL encoded charactersAndrew Newdigate2019-02-221-6/+7
| |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tracing URL templates should be able to include % characters. This test is intended to show that the current implementation needs rework in order to handle this requirement.