Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into reference-pipeline-and-cachingreference-pipeline-and-caching | Douwe Maan | 2015-12-08 | 2 | -65/+5 |
|\ | |||||
| * | Inline Gitlab::Blacklist in NamespaceValidatorrs-validators | Robert Speicher | 2015-12-07 | 1 | -34/+0 |
| | | |||||
| * | Merge branch 'webhook_payload_with_changes' into 'master' | Valery Sizov | 2015-12-07 | 1 | -31/+5 |
| |\ | | | | | | | | | | | | | | | | | | | Add added, modified and removed properties to commit object in webhook https://gitlab.com/gitlab-org/gitlab-ee/issues/20 See merge request !1988 | ||||
| | * | fixes after reviewwebhook_payload_with_changes | Valery Sizov | 2015-12-07 | 1 | -1/+1 |
| | | | |||||
| | * | fox specs | Valery Sizov | 2015-12-07 | 1 | -1/+3 |
| | | | |||||
| | * | Add added, modified and removed properties to commit object in webhook | Valery Sizov | 2015-12-04 | 1 | -30/+2 |
| | | | |||||
* | | | Fix RedactorFilter | Douwe Maan | 2015-12-08 | 1 | -1/+1 |
| | | | |||||
* | | | Move CombinedPipeline methods around | Douwe Maan | 2015-12-08 | 2 | -6/+8 |
| | | | |||||
* | | | Store the demodulized reference filter name in data attribute | Robert Speicher | 2015-12-07 | 2 | -4/+4 |
| | | | |||||
* | | | Merge branch 'master' into reference-pipeline-and-caching | Douwe Maan | 2015-12-07 | 11 | -154/+244 |
|\ \ \ | |/ / | |||||
| * | | Satisfy rubocoplink-refs | Douwe Maan | 2015-12-03 | 1 | -1/+1 |
| | | | |||||
| * | | Pass original text along with label reference filter. | Douwe Maan | 2015-12-03 | 1 | -1/+5 |
| | | | |||||
| * | | Use URL helpers in specs | Douwe Maan | 2015-12-03 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'master' into link-refs | Douwe Maan | 2015-12-03 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| * | | Allow invalid URLs in closing pattern | Douwe Maan | 2015-12-02 | 1 | -1/+3 |
| | | | |||||
| * | | Merge branch 'master' into link-refs | Douwe Maan | 2015-12-02 | 5 | -5/+21 |
| |\ \ | |||||
| * | | | Expand inline docs. | Douwe Maan | 2015-12-01 | 2 | -2/+28 |
| | | | | |||||
| * | | | Pick up direct links to issues/MRs as references. | Douwe Maan | 2015-12-01 | 1 | -1/+16 |
| | | | | |||||
| * | | | Allow reference format as link href | Douwe Maan | 2015-12-01 | 7 | -25/+80 |
| | | | | |||||
| * | | | Autolink first so we don't pick up numeric anchors as issue references. | Douwe Maan | 2015-12-01 | 10 | -25/+58 |
| | | | | |||||
| * | | | Render commit reference using short sha, but include full sha in comment. | Douwe Maan | 2015-12-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix code docs | Douwe Maan | 2015-12-01 | 1 | -8/+7 |
| | | | | |||||
| * | | | Have ClosingIssueExtractor recognize all referenced issues | Douwe Maan | 2015-11-30 | 1 | -4/+10 |
| | | | | |||||
| * | | | Recognize issue/MR/snippet/commit links as references. | Douwe Maan | 2015-11-30 | 7 | -115/+77 |
| | | | | |||||
* | | | | Merge branch 'master' into reference-pipeline-and-caching | Douwe Maan | 2015-12-03 | 1 | -1/+1 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | fix deprecation messages in tests | Valery Sizov | 2015-12-03 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'master' into reference-pipeline-and-caching | Douwe Maan | 2015-12-02 | 9 | -74/+116 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'upload_hook' into 'master' | Valery Sizov | 2015-11-30 | 1 | -0/+17 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fire update hook from GitLab https://gitlab.com/gitlab-org/gitlab-ce/issues/3069 See merge request !1882 | ||||
| | * | | Fire update hook from GitLab | Valery Sizov | 2015-11-30 | 1 | -0/+17 |
| | |/ | |||||
| * | | fix specsrails_update_to_4_2 | Valery Sizov | 2015-11-30 | 2 | -2/+2 |
| | | | |||||
| * | | Migrate mailers to ActiveJob | Valery Sizov | 2015-11-26 | 2 | -3/+2 |
| |/ | |||||
| * | Added total query time to Sherlocksherlock-total-query-time | Yorick Peterse | 2015-11-24 | 1 | -0/+5 |
| | | | | | | | | | | 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). | ||||
| * | Merge branch 'ci-artifacts-path' into 'master' | Robert Speicher | 2015-11-23 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose artifacts path This fixes broken artifacts storage path. Fixes #3607 Fixes #3608 Related: gitlab-org/omnibus-gitlab!544 See merge request !1869 | ||||
| | * | Expose artifacts pathci-artifacts-path | Kamil Trzcinski | 2015-11-23 | 1 | -1/+1 |
| | | | |||||
| * | | 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. | ||||
| * | Error 501 when client is using deprecated API. | Marin Jankovski | 2015-11-20 | 2 | -49/+15 |
| | | |||||
| * | Fix upload tests, reformat code and make rubocop happy | Kamil Trzcinski | 2015-11-20 | 1 | -2/+1 |
| | | |||||
| * | Part of tests done [ci skip] | Kamil Trzcinski | 2015-11-20 | 1 | -11/+16 |
| | | |||||
| * | Add support for batch download operationlfs-batch-download | Kamil Trzcinski | 2015-11-19 | 2 | -28/+79 |
| | | |||||
* | | Move Markdown filters and pipelines into folders. | Douwe Maan | 2015-11-19 | 35 | -46/+46 |
| | | |||||
* | | Merge branch 'master' into reference-pipeline-and-caching | Douwe Maan | 2015-11-19 | 34 | -273/+1327 |
|\ \ | |/ | |||||
| * | Merge branch 'atom-feed-latest-update' into 'master' | Yorick Peterse | 2015-11-19 | 1 | -0/+34 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve performance of user profiles, finding groups, and finding projects This MR improves the following: * Rendering of profile pages and Atom feeds * Finding groups (using GroupsFinder & friends) * Finding projects (using ProjectsFinder & friends) Initially this MR was intended to only improve rendering of Atom feeds, but over time other fixes were introduced as well as the same code was the cause of all these problems. See merge request !1790 | ||||
| | * | Fix UNION syntax for MySQL | Yorick Peterse | 2015-11-18 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+34 |
| | | | | | | | | | | | | | | | | | | | | | 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). | ||||
| * | | Merge branch 'ce-mirror-backport' into 'master' | Douwe Maan | 2015-11-18 | 1 | -3/+4 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport relevant changes from gitlab-org/gitlab-ee!51 To do: - [x] Update gitlab-shell See merge request !1822 | ||||
| | * | | Store and show reason why import failed. | Douwe Maan | 2015-11-18 | 1 | -3/+4 |
| | |/ | |||||
| * | | Merge pull request #9838 from evindor/master | Douwe Maan | 2015-11-18 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | Fix github importer to handle empty issues | ||||
| | * | Fix github importer to handle empty issues | Arseny Zarechnev | 2015-11-18 | 1 | -1/+1 |
| | | | |||||
| * | | Remove small code duplication in user_reference_filter.rb | Dmitriy Zaporozhets | 2015-11-17 | 1 | -6/+9 |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Remove duplication in reference filters | Dmitriy Zaporozhets | 2015-11-16 | 4 | -166/+119 |
| |/ | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> |