summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into reference-pipeline-and-cachingreference-pipeline-and-cachingDouwe Maan2015-12-084-88/+11
|\
| * Inline Gitlab::Blacklist in NamespaceValidatorrs-validatorsRobert Speicher2015-12-071-34/+0
| |
| * Move EmailValidator to app/validatorsRobert Speicher2015-12-071-21/+0
| |
| * Merge branch 'fix-api-private-project-update' into 'master' Dmitriy Zaporozhets2015-12-071-2/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Fix API setting of 'public' attribute to false will make a project private There is a bug in the projects API where setting `public` to `false` of would not change `visibility_level` even if `visiblity_level` were not present. Closes #3864 See merge request !1996
| | * Fix API setting of 'public' attribute to false will make a project privateStan Hu2015-12-051-2/+6
| | | | | | | | | | | | Closes #3864
| * | Merge branch 'webhook_payload_with_changes' into 'master' Valery Sizov2015-12-071-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_changesValery Sizov2015-12-071-1/+1
| | | |
| | * | fox specsValery Sizov2015-12-071-1/+3
| | | |
| | * | Add added, modified and removed properties to commit object in webhookValery Sizov2015-12-041-30/+2
| | | |
* | | | Fix RedactorFilterDouwe Maan2015-12-081-1/+1
| | | |
* | | | Move CombinedPipeline methods aroundDouwe Maan2015-12-082-6/+8
| | | |
* | | | Store the demodulized reference filter name in data attributeRobert Speicher2015-12-072-4/+4
| | | |
* | | | Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-0715-156/+265
|\ \ \ \ | |/ / /
| * | | Merge pull request #9892 from stetskevych/fix_nginx_ssl_configJacob Vosmaer2015-12-071-1/+1
| |\ \ \ | | | | | | | | | | Fix gitlab-ssl nginx config to work when multiple server_names are served over https
| | * | | Fix gitlab-ssl nginx config to work when multiple server_names are served ↵Vyacheslav Stetskevych2015-12-061-1/+1
| | | |/ | | |/| | | | | | | | | over https
| * | | Merge branch 'fix-gitlab-workhorse-initd-check' into 'master' Stan Hu2015-12-061-1/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Check GitLab Workhorse status in init.d script when reporting all components are up and running Closes https://github.com/gitlabhq/gitlabhq/issues/9869 See merge request !1969
| | * | Check GitLab Workhorse status in init.d script when reporting all components ↵Stan Hu2015-12-041-1/+1
| | |/ | | | | | | | | | | | | | | | are up and running Closes https://github.com/gitlabhq/gitlabhq/issues/9869
| * | Merge branch 'link-refs' into 'master' Robert Speicher2015-12-0414-158/+260
| |\ \ | | |/ | |/| | | | | | | | | | | | | Recognize issue/MR/snippet/commit links as references. Fixes #3744 and #3745 See merge request !1933
| | * Satisfy rubocoplink-refsDouwe Maan2015-12-031-1/+1
| | |
| | * Pass original text along with label reference filter.Douwe Maan2015-12-031-1/+5
| | |
| | * Use URL helpers in specsDouwe Maan2015-12-031-2/+2
| | |
| | * Merge branch 'master' into link-refsDouwe Maan2015-12-031-1/+1
| | |\
| | * | Allow invalid URLs in closing patternDouwe Maan2015-12-021-1/+3
| | | |
| | * | Merge branch 'master' into link-refsDouwe Maan2015-12-025-5/+21
| | |\ \
| | * | | Expand inline docs.Douwe Maan2015-12-012-2/+28
| | | | |
| | * | | Pick up direct links to issues/MRs as references.Douwe Maan2015-12-011-1/+16
| | | | |
| | * | | Allow reference format as link hrefDouwe Maan2015-12-017-25/+80
| | | | |
| | * | | Autolink first so we don't pick up numeric anchors as issue references.Douwe Maan2015-12-0110-25/+58
| | | | |
| | * | | Render commit reference using short sha, but include full sha in comment.Douwe Maan2015-12-011-1/+1
| | | | |
| | * | | Fix code docsDouwe Maan2015-12-011-8/+7
| | | | |
| | * | | Have ClosingIssueExtractor recognize all referenced issuesDouwe Maan2015-11-301-4/+10
| | | | |
| | * | | Recognize issue/MR/snippet/commit links as references.Douwe Maan2015-11-307-115/+77
| | | | |
| * | | | Merge branch 'extend-events-api'Dmitriy Zaporozhets2015-12-041-0/+3
| |\ \ \ \
| | * | | | Extent Event and Note APIextend-events-apiDmitriy Zaporozhets2015-12-041-0/+3
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add note to Events API * add author section to Events API * add noteable_id and noteable_type to Notes API Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Add API endpoint to fetch merge request commits listDmitriy Zaporozhets2015-12-041-0/+16
| |/ / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-031-1/+1
|\ \ \ \ | |/ / /
| * | | fix deprecation messages in testsValery Sizov2015-12-031-1/+1
| | |/ | |/|
* | | Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-0219-106/+227
|\ \ \ | |/ /
| * | Merge branch 'upload_hook' into 'master' Valery Sizov2015-11-301-0/+17
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fire update hook from GitLab https://gitlab.com/gitlab-org/gitlab-ce/issues/3069 See merge request !1882
| | * | Fire update hook from GitLabValery Sizov2015-11-301-0/+17
| | |/
| * | Merge branch 'rails_update_to_4_2' into 'master' Valery Sizov2015-11-304-5/+4
| |\ \ | | |/ | |/| | | | | | | | | | | | | Rails update to 4.2.4 https://gitlab.com/gitlab-org/gitlab-ce/issues/2694 See merge request !1902
| | * fix specsrails_update_to_4_2Valery Sizov2015-11-302-2/+2
| | |
| | * Migrate mailers to ActiveJobValery Sizov2015-11-262-3/+2
| | |
| * | Fix alignmentRobert Speicher2015-11-271-6/+6
| | | | | | | | | | | | [ci skip]
| * | Fix indentation in NGINX confignginx-workhorse-upload-limitJacob Vosmaer2015-11-271-6/+6
| | |
| * | Repeat "client_max_body_size 0" everywhereJacob Vosmaer2015-11-272-0/+12
| |/ | | | | | | | | It turns out that if we do not the declaration from "location /" wins.
| * Merge branch 'sherlock-total-query-time' into 'master' Yorick Peterse2015-11-251-0/+5
| |\ | | | | | | | | | | | | | | | | | | | | | Added total query time to Sherlock 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). See merge request !1887
| | * Added total query time to Sherlocksherlock-total-query-timeYorick Peterse2015-11-241-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).
| * | Remove usage of Coloredrs-update-colorizeRobert Speicher2015-11-241-11/+1
| |/
| * Merge branch 'ci-artifacts-path' into 'master' Robert Speicher2015-11-232-1/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose artifacts path This fixes broken artifacts storage path. Fixes #3607 Fixes #3608 Related: gitlab-org/omnibus-gitlab!544 See merge request !1869
View Lorry Controller Status