summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | Merge branch 'make-karma-fast-again' into 'master' Alfredo Sumaran2017-03-208-68/+119
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only add frontend code coverage instrumentation when generating coverage report See merge request !9987
| * | | | | | | | | | | | Only add frontend code coverage instrumentation when generating coverage reportMike Greiling2017-03-208-68/+119
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch '29491-rename-file-for-group-name-toggle' into 'master' Alfredo Sumaran2017-03-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Append _spec to group_name_toggle spec file Closes #29491 See merge request !9975
| * | | | | | | | | | | | Append _spec to group_name_toggle spec fileSam Rose2017-03-171-1/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'simplify-docs-trigger' into 'master' Achilleas Pipinellis2017-03-202-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify trigger_docs build job for CE and EE See merge request !9820
| * | | | | | | | | | | | Fail trigger_docs if triggering build was not successfulwinniehell2017-03-201-1/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Simplify trigger_docs build job for CE and EE (!9820)winniehell2017-03-202-1/+6
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'fix-input-token-spacing' into 'master' Annabel Dunstone Gray2017-03-201-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix input token spacing See merge request !10090
| * | | | | | | | | | | | Fix input token spacingClement Ho2017-03-201-4/+6
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'fix-prometheus-including-d3-main-bundle' into 'master' Alfredo Sumaran2017-03-206-21/+32
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed d3.js from the main application.js bundle Closes #29608 See merge request !10062
| * | | | | | | | | | | | Removed d3.js from the main application.js bundleJose Ivan Vargas Lopez2017-03-206-21/+32
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'issue-filter-bar-alignment' into 'master' Annabel Dunstone Gray2017-03-202-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed filter bar alignment issues Closes #29543 See merge request !10049
| * | | | | | | | | | | | Fixed mobile alignment issuesPhil Hughes2017-03-171-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fixed filter bar alignment issuesPhil Hughes2017-03-172-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #29543
* | | | | | | | | | | | | Merge branch ↵Sean McGivern2017-03-206-43/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '20204-new-issue-button-redirects-you-to-create-a-new-issue-after-logging-in' into 'master' Redirect to signin when New Issue for not logged in Closes #20204 See merge request !9743
| * | | | | | | | | | | | Redirect to signin when New Issue for not logged inSam Rose2017-03-206-43/+69
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch ↵Achilleas Pipinellis2017-03-201-11/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '29713-update-documentation-to-reflect-prometheus-monitors-k8s-by-default' into 'master' Update docs to indicate prometheus k8s monitoring is on by default See merge request !10089
| * | | | | | | | | | | | | Remove unnecessary paragraphJoshua Lambert2017-03-201-3/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Minor tweakJoshua Lambert2017-03-201-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Update docs to indicate prometheus k8s monitoring is on by defaultJoshua Lambert2017-03-201-8/+5
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'deploy-keys-docs' into 'master' Rémy Coutable2017-03-201-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update deploy keys documentation See merge request !10084
| * | | | | | | | | | | | | Update deploy keys documentationAdam Niedzielski2017-03-201-3/+3
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'issue_27212' into 'master' Sean McGivern2017-03-206-1/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add closed_at field to issues Closes #27212 See merge request !9977
| * | | | | | | | | | | | Add closed_at field to issuesFelipe Artur2017-03-176-1/+46
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'routes-lower-case' into 'master' Yorick Peterse2017-03-202-4/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove repeated routes.path check for postgresql database See merge request !10063
| * | | | | | | | | | | | Remove repeated routes.path check for postgresql databasemhasbini2017-03-182-4/+10
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch '29405-fix-project-wiki-update' into 'master' Rémy Coutable2017-03-205-13/+36
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Project Wiki update Closes #29405 See merge request !9990
| * | | | | | | | | | | Fix Project Wiki updateDongqing Hu2017-03-205-13/+36
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'protobuf-3.2.0.2' into 'master' Rémy Coutable2017-03-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use google-protobuf 3.2.0.2 See merge request !10014
| * | | | | | | | | | | Use google-protobuf 3.2.0.2Jacob Vosmaer2017-03-201-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'patch-10' into 'master' Rémy Coutable2017-03-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update 8.12-to-8.13.md: gitlab version 8.13 wants gitlab-shell v3.6.7 See merge request !10071
| * | | | | | | | | | | Update 8.12-to-8.13.md: gitlab version 8.13 wants gitlab-shell v3.6.7Dark Dragon2017-03-181-1/+1
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '29534-todos-performance' into 'master' Sean McGivern2017-03-206-8/+56
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Todos performance: Include associations in Finder See merge request !10076
| * | | | | | | | | | | Todos performance: Include associations in FinderJarka Kadlecova2017-03-206-8/+56
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'fix/regressions-in-ci-v4-api' into 'master' Kamil Trzciński2017-03-205-29/+91
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix regressions introduced while adding CI endpoints in API v4 See merge request !9952
| * | | | | | | | | | | Update example's name in /runners/verify testsTomasz Maczukin2017-03-201-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Simplify Ci::Build#dependencies methodTomasz Maczukin2017-03-201-8/+3
| | | | | | | | | | | |
| * | | | | | | | | | | Send only defined dependenciesTomasz Maczukin2017-03-203-5/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In APIv1 we've been sending all jobs from previous stages and a `dependencies` list with names of jobs that user want to download artifacts from. This was selected on Runners side. In APIv1 we've planned to send only jobs that were defined (if any; and all previous jobs by default). However I've missed the fact that it was Runner who selected jobs, not GitLab. And now current version of APIV4 sends all jobs everytime. This commit fixes this. If user will define `dependencies` in his job, then GitLab will send only selected jobs.
| * | | | | | | | | | | Send token of depenent jobTomasz Maczukin2017-03-202-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Artifacts download for authorization is using a job token of job to which the artifact belongs. In APIv1 the token was sent with dependent jobs details and in APIv4 it was designed to also contain it. However I forgot about this parameter while working on `/api/v4/jobs/request` endpoint. This commit adds a missing parameter which is required for APIv4 to work properly.
| * | | | | | | | | | | Remove legacy Runners support in /api/v4/jobs/requestTomasz Maczukin2017-03-203-25/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Runner v1.3.0 we've started to send User-Agent header with Runner's version data. Since GitLab v8.12.0 we've started to use this header to check if used Runner's version supports 204 status code instead of 404 as a response when there is no jobs to execute by a Runner. In APIv4 (introduced in GitLab 9.0.0) will require Runner v9.0.0. And writing more accurately: GitLab Runner v9.0.0 will require GitLab at least 9.0.0. Because of such breaking change we are able to switch entirely to 204 response code and there is no need to do check of User-Agent. This commit removes useless code and complexity.
| * | | | | | | | | | | Make runner's veryfication working againTomasz Maczukin2017-03-202-0/+39
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In APIv1 we were using UpdateJob to verify if the runner exists. It was the only method that was using Runner's token and used in special way had no side effects (like scheduling a new job or unregisterring a Runner). In APIv4 we've change UpdateJob to use job's token as authentication credentials, and that way we've removed the only endpoint that could be used to verify if the Runner with a certain token exists in target GitLab installation. This commit adds `POST /api/v4/runners/verify` endpoint whose only responsibility is to respond if Runner with posted credentials exists or not.
* | | | | | | | | | | Merge branch '29438-fix-trigger-webhook-for-ref-with-dot' into 'master' Rémy Coutable2017-03-205-17/+49
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow dot in branch name in trigger/builds endpoint in API Closes #29438 See merge request !10001
| * | | | | | | | | | Allow dot in branch name in trigger/builds endpoint in APIGeorge Andrinopoulos2017-03-205-17/+49
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '28890-allow-creating-mr-without-target-branch-in-url' into ↵Sean McGivern2017-03-204-3/+10
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Allow creating merge request even if target branch is not specified in query params Closes #28890 See merge request !9968
| * | | | | | | | | | Allow creating merge request even if target branch is not specified in query ↵Adam Niedzielski2017-03-174-3/+10
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | params Closes #28890
* | | | | | | | | | Merge branch '29662-allow-unauthenticated-branches-api' into 'master' Sean McGivern2017-03-204-58/+134
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow unauthenticated access to some Branch API GET endpoints Closes #29662 See merge request !10077
| * | | | | | | | | Allow unauthenticated access to some Branch API GET endpointsRémy Coutable2017-03-204-58/+134
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Merge branch '3kami3/gitlab-ce-real_ip'Rémy Coutable2017-03-202-0/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See merge request !9623. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9623#note_245736553kami32017-03-032-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issues pointed out.
| * | | | | | | | | Add real_ip setting to nginx example.3kami32017-03-012-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ref) https://docs.gitlab.com/omnibus/settings/nginx.html#configuring-gitlab-trusted_proxies-and-the-nginx-real_ip-module