summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* expire todo count calculations to be consistent withbw-todo-count-expirationBrett Walker2017-12-081-2/+2
| | | | assigned_open_merge_requests_count and assigned_open_issues_count, which are used in the top header stats. Also important for a Geo secondary, so that the pending todo stat gets updated on the same frequency as the users open issues/merge requests.
* 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
|/ / / /
* | | | Merge branch '40825-use-relative-path-urls' into 'master'Robert Speicher2017-12-0711-14/+31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use relative _path helper URLs in the GitLab UI Closes #40825 See merge request gitlab-org/gitlab-ce!15738
| * | | | Use relative _path helper URLs in the GitLab UI40825-use-relative-path-urlsEric Eastwood2017-12-0711-14/+31
| | |_|/ | |/| | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40825
* | | | Merge branch ↵Jacob Schatz2017-12-072-2/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '40555-replace-absolute-urls-with-related-branches-to-avoid-hostname' into 'master' Replace absolute URLs on related branches/MRs with relative url to avoid hostname Closes #40555 See merge request gitlab-org/gitlab-ce!15735
| * | | | Replace absolute URLs on related branches/MRs with relative url to avoid ↵40555-replace-absolute-urls-with-related-branches-to-avoid-hostnameEric Eastwood2017-12-042-2/+8
| | |_|/ | |/| | | | | | | | | | hostname
* | | | Merge branch 'acet-fix-branches-list-on-cherry-pick-modal-after-merge' into ↵Jacob Schatz2017-12-072-0/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix loading branches list on cherry pick modal after merge. Closes #33894 See merge request gitlab-org/gitlab-ce!15306
| * | | | Fix loading branches list on cherry pick modal after merge.acet-fix-branches-list-on-cherry-pick-modal-after-mergeFatih Acet2017-12-042-0/+14
| | | | |
* | | | | Merge branch 'use-us-english' into 'master'Jacob Schatz2017-12-071-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation about using US-English Closes #40675 See merge request gitlab-org/gitlab-ce!15656
| * | | | | Add documentation about using US-EnglishClement Ho2017-12-071-0/+2
|/ / / / /
* | | | | Merge branch 'fix-transient-datefix-spec' into 'master'Jacob Schatz2017-12-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix transient error in pikadayToString Closes #40858 See merge request gitlab-org/gitlab-ce!15754
| * | | | | Fix transient error in pikadayToStringfix-transient-datefix-specClement Ho2017-12-051-1/+1
| | | | | |
* | | | | | Merge branch 'fix_39233' into 'master'Sean McGivern2017-12-073-1/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix #39233 - 500 in merge request Closes #39233 See merge request gitlab-org/gitlab-ce!15774
| * | | | | | fix #39233 - 500 in merge requestMartin Nowak2017-12-073-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - handle unchanged empty lines in inline diff
* | | | | | | Merge branch 'feature/sm/34834-missing-dependency-should-fail-job-2' into ↵Kamil Trzciński2017-12-0710-5/+272
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Dependency validator Closes #34834 See merge request gitlab-org/gitlab-ce!14009
| * | | | | | | Clean up docs for dependencies validationfeature/sm/34834-missing-dependency-should-fail-job-2Achilleas Pipinellis2017-12-073-16/+63
| | | | | | | |
| * | | | | | | Test for both ci_disable_validates_dependencies true/falseShinya Maeda2017-12-082-78/+129
| | | | | | | |
| * | | | | | | Change feature flag to ci_disable_validates_dependencies to enable it as defaultShinya Maeda2017-12-073-3/+3
| | | | | | | |
| * | | | | | | Update document to use ci_validates_dependenciesShinya Maeda2017-12-072-10/+12
| | | | | | | |
| * | | | | | | Fix pipelineShinya Maeda2017-12-061-1/+3
| | | | | | | |
| * | | | | | | Fix testsShinya Maeda2017-12-062-28/+32
| | | | | | | |
| * | | | | | | Fix /build_spec.rbShinya Maeda2017-12-062-9/+14
| | | | | | | |
| * | | | | | | Optimize valid_dependency method by ayufan thoughtShinya Maeda2017-12-061-15/+11
| | | | | | | |
| * | | | | | | Add feature flagShinya Maeda2017-12-062-2/+19
| | | | | | | |
| * | | | | | | Fix lintShinya Maeda2017-12-062-4/+13
| | | | | | | |
| * | | | | | | Add case when artifacts have not existed on dependenciesShinya Maeda2017-12-064-7/+61
| | | | | | | |
| * | | | | | | Use Class.new(StandardError) instead of custom extended error class. Bring ↵Shinya Maeda2017-12-065-16/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | back specified_dependencies?.
| * | | | | | | Add changelog. Fix docShinya Maeda2017-12-062-1/+7
| | | | | | | |
| * | | | | | | Fail jobs if its dependency is missingShinya Maeda2017-12-067-1/+81
| | | | | | | |
* | | | | | | | Merge branch 'deploy-keys-loading-icon' into 'master'Filipa Lacerda2017-12-075-4/+31
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed remove deploy key loading icon not being removed after canceling Closes #37595 See merge request gitlab-org/gitlab-ce!15779
| * | | | | | | | Fixed remove deploy key loading icon not being removed after cancelingdeploy-keys-loading-iconPhil Hughes2017-12-075-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #37595
* | | | | | | | | Merge branch '40715-updateendpoint-undefined-on-issue-page' into 'master'Clement Ho2017-12-072-25/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "updateEndpoint undefined on Issue page" Closes #40715 See merge request gitlab-org/gitlab-ce!15698
| * | | | | | | | | Resolve "updateEndpoint undefined on Issue page"Luke Bennett2017-12-072-25/+7
|/ / / / / / / / /
* | | | | | | | | Merge branch 'gitaly-0.59.0' into 'master'Sean McGivern2017-12-071-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Gitaly 0.59.0 See merge request gitlab-org/gitlab-ce!15795
| * | | | | | | | | Use Gitaly 0.59.0Jacob Vosmaer2017-12-071-1/+1
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'docs-fix-typo' into 'master'Achilleas Pipinellis2017-12-071-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: fix typo See merge request gitlab-org/gitlab-ce!15798
| * | | | | | | | | fix typoMarcia Ramos2017-12-071-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'pawel/update-prometheus_gem_to_highly_optimized_version' into ↵Stan Hu2017-12-074-15/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Update prometheus-client-mmap gem to highly optimized version See merge request gitlab-org/gitlab-ce!15796
| * | | | | | | | | | Update prometheus-client-mmap gem to highly optimized versionPawel Chojnacki2017-12-074-15/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + change string concatenation to help with GC pressure. + fix metric producing incompatible label sets
* | | | | | | | | | | Merge branch 'fix/push-read-only-message-ce' into 'master'Douwe Maan2017-12-072-2/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE] Fix message when pushing to Geo secondary See merge request gitlab-org/gitlab-ce!15793
| * | | | | | | | | | | refactor code to match EE changesJames Lopez2017-12-072-2/+10
| | | | | | | | | | | |
View Lorry Controller Status