summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'increase-etag-cache-expiry-time' into 'master' Sean McGivern2017-03-231-1/+1
|\ | | | | | | | | Increase ETag cache expiry time See merge request !10180
| * Increase ETag cache expiry timeAdam Niedzielski2017-03-231-1/+1
| | | | | | | | As discussed in #29777.
* | Introduce a new middleware for the test environment that can block requestsRémy Coutable2017-03-221-0/+61
|/ | | | | | | | | | | | The idea is that after each feature spec example, we block all incoming requests at the Rack level, go to the 'about:blank' page, and wait until the current requests reach 0. This should solve the problem where a request would end after database cleaner performed the database truncation. The problem was that a GET request can still lead to records creation (e.g. namespaces or routes). Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'gitaly-install-rake' into 'master' Robert Speicher2017-03-215-9/+94
|\ | | | | | | | | | | | | Docs and scripts to install Gitaly from source Closes gitaly#136 and #28446 See merge request !9941
| * Add gitaly source installation instructionsJacob Vosmaer2017-03-212-8/+63
| |
| * Print command output when a task failedJacob Vosmaer2017-03-211-1/+1
| | | | | | | | This helps you understand why the command failed.
| * Rake task that can install gitaly at a tag versionJacob Vosmaer2017-03-212-0/+30
| |
* | Resolve "Circular dependency detected" (duplicate)Mike Greiling2017-03-211-4/+4
|/
* Merge branch 'index-routes-path-for-like' into 'master' Douwe Maan2017-03-211-0/+2
|\ | | | | | | | | | | | | Add LIKE index for routes.path Closes #29554 See merge request !10060
| * Add LIKE index for routes.pathYorick Peterse2017-03-211-0/+2
| | | | | | | | | | | | | | | | Nested groups support uses queries along the lines of `path LIKE 'X/%'`. For these queries to use an index on PostgreSQL we need to use either the varchar_pattern_ops or text_pattern_ops operator class. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/29554
* | Add a rake task to reset all email and private tokensJames Lopez2017-03-211-0/+38
| |
* | Merge branch 'api-project-issues-404' into 'master' Sean McGivern2017-03-212-2/+2
|\ \ | |/ |/| | | | | | | | | Return 404 in project issues API endpoint when project cannot be found Closes #29631 See merge request !10093
| * Return 404 in project issues API endpoint when project cannot be foundAdam Niedzielski2017-03-202-2/+2
| | | | | | | | Closes #29631
* | Merge branch ↵Sean McGivern2017-03-211-0/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | '29685-wrong-number-of-arguments-calling-http_url_to_repo-on-cloning-project-wikis' into 'master' Fix ProjectWiki#http_url_to_repo signature Closes #29685 See merge request !10079
| * | Fix ProjectWiki#http_url_to_repo signatureRémy Coutable2017-03-201-0/+6
| |/ | | | | | | | | | | | | New Gitlab::UrlSanitizer.http_credentials_for_user method responsible for generating a credentials hash from a user. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'sh-fix-admin-application-settings' into 'master' Robert Speicher2017-03-211-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Fix Error 500 when application settings are saved Closes #29674 and #29115 See merge request !10070
| * | Make level_value accept string integersToon Claes2017-03-201-2/+2
| | | | | | | | | | | | | | | | | | | | | When a VisibilityLevel is an integer formatted as a string, convert it to an integer, instead of looking it up in the hash map. When the value is not recognized, default to PRIVATE.
* | | Merge remote-tracking branch 'dev/master'DJ Mountney2017-03-203-2/+62
|\ \ \ | |_|/ |/| |
| * | Merge branch 'ssrf' into 'security' Rubén Dávila2017-03-201-0/+2
| | | | | | | | | | | | | | | nil check for url_blocker? See merge request !2076
| * | Merge branch 'ssrf' into 'security' Douwe Maan2017-03-201-0/+57
| | | | | | | | | | | | | | | Protect server against SSRF in project import URLs See merge request !2068
| * | Merge branch 'fix-links-target-blank' into 'security'Jacob Schatz2017-03-202-2/+3
| | | | | | | | | | | | | | | | | | Adds rel="noopener noreferrer" to all links with target="_blank" See merge request !2071
* | | Merge branch 'fix/regressions-in-ci-v4-api' into 'master' Kamil Trzciński2017-03-203-13/+19
|\ \ \ | | | | | | | | | | | | | | | | Fix regressions introduced while adding CI endpoints in API v4 See merge request !9952
| * | | Send only defined dependenciesTomasz Maczukin2017-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-202-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-201-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Allow dot in branch name in trigger/builds endpoint in APIGeorge Andrinopoulos2017-03-202-2/+2
| | | |
* | | | Allow unauthenticated access to some Branch API GET endpointsRémy Coutable2017-03-201-1/+1
|/ / / | | | | | | | | | 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
* | | All CI offline migrationsKamil Trzciński2017-03-173-28/+9
| |/ |/|
* | Merge branch 'database-config-method' into 'master' Rémy Coutable2017-03-171-1/+5
|\ \ | | | | | | | | | | | | Added Gitlab::Database.config See merge request !10045
| * | Added Gitlab::Database.configYorick Peterse2017-03-171-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | This returns the ActiveRecord configuration for the current environment. While CE doesn't use this very often, EE will use it in a few places for the database load balancing code. I'm adding this to CE so we don't end up with merge conflicts in this file.
* | | Merge branch 'feature/use-gitaly-for-commit-show' into 'master'Robert Speicher2017-03-174-3/+61
|\ \ \ | |/ / |/| | | | | | | | Use Gitaly for CommitController#show See merge request !9629
| * | Use Gitaly for CommitController#showfeature/use-gitaly-for-commit-showAhmad Sherif2017-03-154-3/+61
| | |
* | | Merge branch '29604-v3-fix-branch-creation' into 'master' Sean McGivern2017-03-171-0/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use "branch_name" instead "branch" on V3 branch creation API Closes #29604 See merge request !10030
| * | | Use "branch_name" instead "branch" on V3 branch creation API29604-v3-fix-branch-creationOswaldo Ferreira2017-03-161-0/+21
| | | |
* | | | Merge branch ↵Sean McGivern2017-03-171-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '26470-branch-names-with-reference-prefixes-results-in-buggy-branches' into 'master' Strip reference prefixes on branch creation Closes #26470 See merge request !8498
| * | | | Strip reference prefixes on branch creationMatthieu Tardy2017-01-091-0/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthieu Tardy <matthieu.tardy@gmail.com>
* | | | | Use Enumerable#index_by where possibledm-use-index-byDouwe Maan2017-03-163-13/+3
| |/ / / |/| | |
* | | | Merge branch 'pages-multiple-ips-doc' into 'master' Kamil Trzciński2017-03-161-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | The GitLab Pages external-http and external-https arguments can be specified multiple times See merge request !9812
| * | | | The GitLab Pages external-http and external-https arguments can be specified ↵Nick Thomas2017-03-081-2/+2
| | | | | | | | | | | | | | | | | | | | multiple times
* | | | | Merge branch '27988-fix-transient-failure-in-commits-api' into 'master' Sean McGivern2017-03-1659-76/+86
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure dots in project and group ID are allowed in the API endpoints Closes #27988 See merge request !9944
| * | | | | Add `requirements: { id: %r{[^/]+} }` for all projects and groups namespaced ↵Rémy Coutable2017-03-1659-76/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API routes Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Ensure dots in project path is allowed in the commits APIRémy Coutable2017-03-142-2/+2
| | |_|/ / | |/| | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch ↵Rémy Coutable2017-03-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '29565-name-of-the-uncompressed-folder-of-a-tag-archive-changed' into 'master' Fix archive prefix bug for refs containing dots Closes #29565 See merge request !10007
| * | | | | Fix archive prefix bug for refs containing dotsMark Fletcher2017-03-161-1/+1
| | | | | |
* | | | | | This quick-fixes an issue with existing award emoji not being valid anymoreRémy Coutable2017-03-161-14/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::Emoji#gl_emoji_tag now returns early instead of raising a 500 error. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch '27114-add-undo-mark-all-as-done-to-todos' into 'master' Filipa Lacerda2017-03-161-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 'Undo mark all as done' to Todos Closes #27114 See merge request !9890