Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | Merge branch 'master' into reference-pipeline-and-caching | Douwe Maan | 2015-10-27 | 3 | -2/+32 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Fix specs | Douwe Maan | 2015-10-22 | 1 | -4/+4 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'master' into reference-pipeline-and-caching | Douwe Maan | 2015-10-21 | 1 | -3/+28 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'master' into rs-redactor-filter | Douwe Maan | 2015-10-14 | 6 | -1/+176 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Use Gitlab::Markdown for Asciidoc and ReferenceExtractor pipelines | Douwe Maan | 2015-10-14 | 1 | -3/+3 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Block LDAP user when they are no longer found in the LDAP server | Drew Blessing | 2015-12-08 | 1 | -0/+5 | |
| |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
* | | | | | | | | Merge branch 'webhook_payload_with_changes' into 'master' | Valery Sizov | 2015-12-07 | 1 | -6/+3 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add added, modified and removed properties to commit object in webhook https://gitlab.com/gitlab-org/gitlab-ee/issues/20 See merge request !1988 | |||||
| * | | | | | | | Add added, modified and removed properties to commit object in webhook | Valery Sizov | 2015-12-04 | 1 | -6/+3 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | Use URL helpers in specs | Douwe Maan | 2015-12-03 | 2 | -7/+11 | |
| | | | | | | | ||||||
* | | | | | | | Allow invalid URLs in closing pattern | Douwe Maan | 2015-12-02 | 1 | -0/+49 | |
| | | | | | | | ||||||
* | | | | | | | Merge branch 'master' into link-refs | Douwe Maan | 2015-12-02 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | fix specsrails_update_to_4_2 | Valery Sizov | 2015-11-30 | 1 | -3/+3 | |
| | | | | | | | ||||||
* | | | | | | | Satisfy Rubocop | Douwe Maan | 2015-12-02 | 2 | -2/+2 | |
| | | | | | | | ||||||
* | | | | | | | Pick up direct links to issues/MRs as references. | Douwe Maan | 2015-12-01 | 7 | -41/+145 | |
| | | | | | | | ||||||
* | | | | | | | Autolink first so we don't pick up numeric anchors as issue references. | Douwe Maan | 2015-12-01 | 5 | -87/+87 | |
| | | | | | | | ||||||
* | | | | | | | Render commit reference using short sha, but include full sha in comment. | Douwe Maan | 2015-12-01 | 2 | -4/+4 | |
| | | | | | | | ||||||
* | | | | | | | Fix specs | Douwe Maan | 2015-11-30 | 2 | -3/+1 | |
| | | | | | | | ||||||
* | | | | | | | Recognize commit range with named refs in compare URLs. | Douwe Maan | 2015-11-30 | 1 | -5/+6 | |
| | | | | | | | ||||||
* | | | | | | | Recognize issue/MR/snippet/commit links as references. | Douwe Maan | 2015-11-30 | 5 | -3/+158 | |
| | | | | | | | ||||||
* | | | | | | | Render commit range reference with short shas, link to full shas. | Douwe Maan | 2015-11-30 | 1 | -3/+4 | |
|/ / / / / / | ||||||
* | | | | | | Added total query time to Sherlocksherlock-total-query-time | Yorick Peterse | 2015-11-24 | 1 | -0/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it easier to see if a problem is caused by slow queries or slow Ruby code (unrelated to any SQL queries that might be used). | |||||
* | | | | | | Update required version of lfs client and separate the docs for users and ↵required_version_and_docs_update | Marin Jankovski | 2015-11-20 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | admins. | |||||
* | | | | | | Merge branch 'lfs-batch-download' into 'master' | Marin Jankovski | 2015-11-20 | 1 | -215/+330 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for batch download operation - Drops Accept for all download requests, - Allows to do batch download for public projects and non-authorized users - Returns 501 for legacy API with message to upgrade the client /cc @marin @jacobvosmaer @yorickpeterse See merge request !1842 | |||||
| * | | | | | | Error 501 when client is using deprecated API. | Marin Jankovski | 2015-11-20 | 1 | -146/+34 | |
| | | | | | | | ||||||
| * | | | | | | Fix upload tests, reformat code and make rubocop happy | Kamil Trzcinski | 2015-11-20 | 1 | -120/+109 | |
| | | | | | | | ||||||
| * | | | | | | Part of tests done [ci skip] | Kamil Trzcinski | 2015-11-20 | 1 | -93/+322 | |
| | | | | | | | ||||||
| * | | | | | | Add support for batch download operationlfs-batch-download | Kamil Trzcinski | 2015-11-19 | 1 | -8/+17 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Merge branch 'ci-yaml-validation' into 'master' | Kamil Trzciński | 2015-11-19 | 1 | -1/+5 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commits without .gitlab-ci.yml are marked as skipped - Commits without .gitlab-ci.yml are marked as skipped - Save detailed error when YAML syntax This also fixes: #3521 #3546 /cc @jacobvosmaer See merge request !1827 | |||||
| * | | | | | | Commits without .gitlab-ci.yml are marked as skipped | Kamil Trzcinski | 2015-11-19 | 1 | -1/+5 | |
| |/ / / / / | | | | | | | | | | | | | | | | | | | - Save detailed error when YAML syntax | |||||
* | | | | | | Merge branch 'emoji_votes' into 'master' | Dmitriy Zaporozhets | 2015-11-19 | 1 | -188/+0 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Award Emoji This it first iteration of award emoji feature. We have plan to extend emoji picker by the next release. For now, you can add award by clicking to the emoji picker or posting a regular comment with emoji like ":+1:" and any other. You can post not only emoji that listed in the emoji picker. See merge request !1825 | |||||
| * | | | | | award emoji | Valery Sizov | 2015-11-19 | 1 | -188/+0 | |
| | | | | | | ||||||
* | | | | | | Fix UNION syntax for MySQL | Yorick Peterse | 2015-11-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently MySQL doesn't support this syntax: (...) UNION (...) instead it only supports: ... UNION ... | |||||
* | | | | | | Added Gitlab::SQL::Union class | Yorick Peterse | 2015-11-18 | 1 | -0/+16 | |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This class can be used to join multiple AcitveRecord::Relation objects together using a SQL UNION statement. ActiveRecord < 5.0 sadly doesn't support UNION and existing Gems out there don't handle prepared statements (e.g. they never incremented the variable bindings). | |||||
* | | | | | Add support for git lfs.lfs | Marin Jankovski | 2015-11-16 | 1 | -0/+650 | |
| | | | | | ||||||
* | | | | | Move spec to proper place and fix unused variablerefactor-complex-methods | Dmitriy Zaporozhets | 2015-11-13 | 1 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | | | | Allow to define cache in `.gitlab-ci.yml`caches | Kamil Trzcinski | 2015-11-10 | 1 | -0/+82 | |
| | | | | | ||||||
* | | | | | Change artifacts syntax to allow uploading untracked files | Kamil Trzcinski | 2015-11-10 | 1 | -5/+18 | |
| | | | | | ||||||
* | | | | | Implement Build Artifacts | Kamil Trzcinski | 2015-11-10 | 1 | -0/+38 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Offloads uploading to GitLab Workhorse - Use /authorize request for fast uploading - Added backup recipes for artifacts - Support download acceleration using X-Sendfile | |||||
* | | | | | Track the amount of times views are rendered | Yorick Peterse | 2015-11-09 | 1 | -0/+57 | |
| | | | | | ||||||
* | | | | | Fixed Hash key style in Sherlock::Query spec | Yorick Peterse | 2015-11-09 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Added specs and source documentation for Sherlock | Yorick Peterse | 2015-11-09 | 8 | -0/+639 | |
| | | | | | ||||||
* | | | | | Merge branch 'web_hook_repo_changes' | Valery Sizov | 2015-11-03 | 1 | -0/+6 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add added, modified and removed properties to commit object in webhookweb_hook_repo_changes | Valery Sizov | 2015-11-03 | 1 | -0/+6 | |
| | | | | | | ||||||
* | | | | | | Fix testsonly-syntax | Kamil Trzcinski | 2015-11-03 | 1 | -15/+11 | |
| | | | | | | ||||||
* | | | | | | Extend yml syntax for only and except to support specifying repository path | Kamil Trzcinski | 2015-11-02 | 1 | -79/+224 | |
|/ / / / / | ||||||
* | | | | | Merge branch 'rs-dev-issue-2613' into 'master' | Douwe Maan | 2015-11-02 | 1 | -10/+91 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add custom protocol whitelisting to SanitizationFilter Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2613 We allow any protocol for autolinks: irc://irc.freenode.net/git But manual Markdown links with the same protocol get sanitized: `[This will not be clickable](irc://irc.freenode.net/git)`: [This will not be clickable](irc://irc.freenode.net/git) To get around this we have to first allow *all* protocols, and then manually clean dangerous (i.e., `javascript:`) protocols. See merge request !1496 | |||||
| * | | | | Add custom protocol whitelisting to SanitizationFilterrs-dev-issue-2613 | Robert Speicher | 2015-10-01 | 1 | -10/+91 | |
| | | | | | | | | | | | | | | | | | | | | Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2613 | |||||
* | | | | | Merge branch 'dirceu/gitlab-ce-fix-project-search-with-unmatched-parentheses' | Douwe Maan | 2015-10-25 | 1 | -2/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix issue #3055 (project search with unmatched parentheses)dirceu/gitlab-ce-fix-project-search-with-unmatched-parentheses | Dirceu Pereira Tiegs | 2015-10-21 | 1 | -2/+2 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Add spec for cloning Wiki over HTTP | Stan Hu | 2015-10-22 | 1 | -0/+16 | |
| | | | | |