summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix broken testFilipa Lacerda2017-12-111-1/+1
|
* Improve empty states for TODOs and issuesFilipa Lacerda2017-12-113-8/+11
|
* Merge branch 'master' into 40468-empty-statesFilipa Lacerda2017-12-11267-1928/+4153
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (76 commits) Fix image view mode Remove the need for destroy and add a comment in the spec Use build instead of create in importer spec Simplify normalizing of paths Fix failing importer test case on MySQL due to missing trailing slash in root path Fix gitlab:import:repos Rake task moving repositories into the wrong location Allow git pull/push on project redirects Resolve "Include asset_sync gem" Use prefix for TableOfContents filter hrefs Resolve "No feedback when checking on checklist if potential spam was detected" Fix Rubocop Fix N+1 query when displaying events Add Chain::Command specs Fix a bug of before_sha being inproperly evaluated to `checkout_sha` Implement and use Gitlab::Ci::Pipeline::Chain::Command Fix invalid pipeline build chain tag evaluation Add docs explaining why you get signed out with "Remember me" Move the circuitbreaker check out in a separate process Migrate Git::Repository#fsck to Gitaly Fix new personal access token showing up in a flash message ...
| * Merge branch 'fix-image-view-mode' into 'master'Filipa Lacerda2017-12-112-2/+14
| |\ | | | | | | | | | | | | | | | | | | Fix image view mode Closes #40945 See merge request gitlab-org/gitlab-ce!15803
| | * Fix image view modeClement Ho2017-12-112-2/+14
| |/
| * Merge branch 'es-module-compare' into 'master'Filipa Lacerda2017-12-114-86/+73
| |\ | | | | | | | | | | | | Convert Compare and CompareAutocomplete classes into ES module syntax See merge request gitlab-org/gitlab-ce!14857
| | * revert arrow function changees-module-compareMike Greiling2017-11-301-1/+1
| | |
| | * convert CompareAutocomplete from class definition into simple function call, ↵Mike Greiling2017-11-303-65/+56
| | | | | | | | | | | | remove global export
| | * convert Compare class into ES module import/export syntaxMike Greiling2017-11-303-4/+3
| | |
| | * refactor Compare class to ES class syntaxMike Greiling2017-11-301-18/+16
| | |
| | * remove commits.js import form main.js (related to !14735)Mike Greiling2017-11-301-1/+0
| | |
| * | Merge branch 'sh-fix-import-rake-task' into 'master'James Lopez2017-12-115-0/+32
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix gitlab:import:repos Rake task moving repositories into the wrong location Closes #40765 See merge request gitlab-org/gitlab-ce!15823
| | * | Remove the need for destroy and add a comment in the specStan Hu2017-12-101-4/+3
| | | |
| | * | Use build instead of create in importer specStan Hu2017-12-101-1/+1
| | | |
| | * | Simplify normalizing of pathsStan Hu2017-12-101-4/+3
| | | |
| | * | Fix failing importer test case on MySQL due to missing trailing slash in ↵sh-fix-import-rake-taskStan Hu2017-12-083-1/+15
| | | | | | | | | | | | | | | | root path
| | * | Fix gitlab:import:repos Rake task moving repositories into the wrong locationStan Hu2017-12-083-0/+20
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | If the source import directory were different from the destination directory, GitLab would first create a blank repository and then erroneously move the original one into a subdirectory. Adding an import type prevents this the project from being initialized in the first place. It was accidentally removed in 1f917cbd49. Closes #40765
| * | Merge branch 'docs/improve-limit-conflicts-with-ee' into 'master'Robert Speicher2017-12-087-355/+110
| |\ \ | | | | | | | | | | | | | | | | Move the "Limit conflicts with EE" doc to "Automatic CE-> EE merge" See merge request gitlab-org/gitlab-ce!15749
| | * | Add "Guidelines for implementing Enterprise Edition features" in CE ↵docs/improve-limit-conflicts-with-eeRémy Coutable2017-12-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | development doc since the doc page is already there Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | Address Robert's and Axil's feedbackRémy Coutable2017-12-064-15/+17
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | Move the "Limit conflicts with EE" doc to "Automatic CE-> EE merge"Rémy Coutable2017-12-056-353/+105
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Merge branch '35385-allow-git-pull-push-on-project-redirects' into 'master'Douwe Maan2017-12-0820-52/+510
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow git pull/push on project redirects Closes #35385 See merge request gitlab-org/gitlab-ce!15670
| | * | | Allow git pull/push on project redirectsMayra Cabrera2017-12-0820-52/+510
| |/ / /
| * | | Merge branch '38032-deploy-markers-should-be-more-verbose' into 'master'Mike Greiling2017-12-0812-38/+199
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Deploy markers should be more verbose" Closes #38032 See merge request gitlab-org/gitlab-ce!15641
| | * | | Reduce the size of the deploy flag when there's no tag available38032-deploy-markers-should-be-more-verboseJose Ivan Vargas2017-12-071-3/+11
| | | | |
| | * | | Changed the deploy markers on the prometheus dashboard to be more verboseJose Ivan Vargas2017-12-0712-38/+191
| | | | |
| * | | | Merge branch '40031-include-assset_sync-gem' into 'master'Douwe Maan2017-12-084-0/+45
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Include asset_sync gem" Closes #40031 See merge request gitlab-org/gitlab-ce!15734
| | * | | | Resolve "Include asset_sync gem"Ian Baum2017-12-084-0/+45
| |/ / / /
| * | | | Merge branch 'fix-event-target-author-preloading' into 'master'Douwe Maan2017-12-082-1/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix N+1 query when displaying events See merge request gitlab-org/gitlab-ce!15788
| | * | | | Fix N+1 query when displaying eventsfix-event-target-author-preloadingYorick Peterse2017-12-082-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When displaying events we would load the target of those events, then render the entire data using our Markdown pipeline. This pipeline would eventually request the author of every target, leading to an additional query being executed for every target to get the author. To fix this we now eager load the author of the event's target. In my local environment this reduces the number of queries to display a project's Atom feed from 40 to 24 queries. See https://gitlab.com/gitlab-org/gitlab-ce/issues/36878 for more information.
| * | | | | Merge branch 'jprovazn-ignore-anchors' into 'master'Sean McGivern2017-12-084-0/+23
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use prefix for TableOfContents filter hrefs Closes #38473 See merge request gitlab-org/gitlab-ce!15806
| | * | | | | Use prefix for TableOfContents filter hrefsJan Provaznik2017-12-084-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TableOfContents filter generates hrefs for each header in markdown, if the header text consists from digits and redacted symbols only, e.g. "123" or "1.0 then the auto-generated href has the same format as issue references. If the generated id contains only digits, then 'anchor-' prefix is prepended to the id. Closes #38473
| * | | | | | Merge branch 'fix/gb/fix-pipeline-build-chain-tag-evaluation' into 'master'Douwe Maan2017-12-0816-111/+367
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix invalid pipeline build chain tag evaluation Closes #40944 See merge request gitlab-org/gitlab-ce!15805
| | * | | | | | Fix RubocopKamil Trzcinski2017-12-081-1/+1
| | | | | | | |
| | * | | | | | Add Chain::Command specsfix/gb/fix-pipeline-build-chain-tag-evaluationKamil Trzcinski2017-12-084-10/+190
| | | | | | | |
| | * | | | | | Fix a bug of before_sha being inproperly evaluated to `checkout_sha`Kamil Trzcinski2017-12-081-5/+1
| | | | | | | |
| | * | | | | | Implement and use Gitlab::Ci::Pipeline::Chain::CommandKamil Trzcinski2017-12-0814-127/+146
| | | | | | | |
| | * | | | | | Fix invalid pipeline build chain tag evaluationGrzegorz Bizon2017-12-084-8/+69
| | | | | | | |
| * | | | | | | Merge branch ↵Sean McGivern2017-12-0816-68/+363
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '29483-no-feedback-when-checking-on-checklist-if-potential-spam-was-detected' into 'master' Resolve "No feedback when checking on checklist if potential spam was detected" Closes #29483 See merge request gitlab-org/gitlab-ce!15408
| | * | | | | | Resolve "No feedback when checking on checklist if potential spam was detected"Luke Bennett2017-12-0816-68/+363
| |/ / / / / /
| * | | | | | Merge branch 'docs/add-why-do-i-get-signed-out-authentication-section' into ↵Sean McGivern2017-12-083-1/+31
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add docs explaining why you get signed out with "Remember me" checked See merge request gitlab-org/gitlab-ce!15756
| | * | | | | | Add docs explaining why you get signed out with "Remember me"docs/add-why-do-i-get-signed-out-authentication-sectionEric Eastwood2017-12-083-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.slack.com/archives/C101F3796/p1512486640000434
| * | | | | | | Merge branch 'bvl-circuitbreaker-process' into 'master'Douwe Maan2017-12-0845-362/+983
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check NFS mounts in a separate process Closes #39847 See merge request gitlab-org/gitlab-ce!15426
| | * | | | | | | Move the circuitbreaker check out in a separate processbvl-circuitbreaker-processBob Van Landuyt2017-12-0845-362/+983
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving the check out of the general requests, makes sure we don't have any slowdown in the regular requests. To keep the process performing this checks small, the check is still performed inside a unicorn. But that is called from a process running on the same server. Because the checks are now done outside normal request, we can have a simpler failure strategy: The check is now performed in the background every `circuitbreaker_check_interval`. Failures are logged in redis. The failures are reset when the check succeeds. Per check we will try `circuitbreaker_access_retries` times within `circuitbreaker_storage_timeout` seconds. When the number of failures exceeds `circuitbreaker_failure_count_threshold`, we will block access to the storage. After `failure_reset_time` of no checks, we will clear the stored failures. This could happen when the process that performs the checks is not running.
| * | | | | | | Merge branch '40754-fix-flash-usage-with-personal-access-token' into 'master'Grzegorz Bizon2017-12-084-5/+52
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix new personal access token showing up in a flash message Closes #40754 See merge request gitlab-org/gitlab-ce!15707
| | * | | | | | | Fix new personal access token showing up in a flash message40754-fix-flash-usage-with-personal-access-tokenEric Eastwood2017-12-074-5/+52
| | | | | | | | |
| * | | | | | | | Merge branch 'jprovazn-testfix2' into 'master'Stan Hu2017-12-081-5/+5
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean test path between merge request handler tests Closes #40900 See merge request gitlab-org/gitlab-ce!15792
| | * | | | | | | | Clean test path between merge request handler testsjprovazn-testfix2Jan Provaznik2017-12-071-5/+5
| | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | create_merge_request_handler_spec needs a repository for some tests but this repository lasts on disk by default which causes failures of other tests. TestEnv.clean_test_path is used to get rid of the repository after each test. Closes #40900
| * | | | | | | | Merge branch 'gitaly-795-migrate-repository-fsck' into 'master'Robert Speicher2017-12-082-2/+27
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Git::Repository#fsck to Gitaly Closes gitaly#795 See merge request gitlab-org/gitlab-ce!15731
| | * | | | | | | | Migrate Git::Repository#fsck to GitalyKim Carlbäcker2017-12-082-2/+27
| |/ / / / / / / /
View Lorry Controller Status