summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Fix commits_spec25317-prioritize-author-date-over-commitAnnabel Dunstone Gray2017-12-131-1/+1
|
* small change to make less conflict with EE versionBrett Walker2017-12-111-6/+4
|
* Merge branch 'sh-remove-allocation-tracking-influxdb' into 'master'Yorick Peterse2017-12-112-46/+0
|\ | | | | | | | | | | | | Remove allocation tracking code from InfluxDB sampler for performance Closes gitlab-com/infrastructure#3250 See merge request gitlab-org/gitlab-ce!15834
| * Remove RubySampler#sample_objects for performance as wellStan Hu2017-12-111-23/+0
| |
| * Remove allocation tracking code from InfluxDB sampler for performancesh-remove-allocation-tracking-influxdbStan Hu2017-12-101-23/+0
| | | | | | | | | | | | | | | | | | On GitLab.com, InfluxSampler#sample_objects appears to take 1.2 s or so to iterate through 1059 objects. This had led to delays of a couple hundred milliseconds in processing in the main thread. Remove this code since it's not really being used. Closes gitlab-com/infrastructure#3250
* | Merge branch 'remove_assignee_id' into 'master'Yorick Peterse2017-12-112-1/+38
|\ \ | | | | | | | | | | | | | | | | | | Remove issues.assignee_id column Closes #30453 See merge request gitlab-org/gitlab-ce!11637
| * | Add spec for removing issues.assignee_idSean McGivern2017-12-111-0/+37
| | | | | | | | | | | | | | | This migration also needs to be a post-deployment migration, as it removes a column.
| * | Fix specs after removing assignee_id fieldValery Sizov2017-12-111-1/+1
| | |
* | | Merge branch ↵Douwe Maan2017-12-112-0/+39
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '40743-bug-accepting-new-group-members-when-permission-level-developer' into 'master' Bugfix: User can't change the access level of an access requester Closes #40743 See merge request gitlab-org/gitlab-ce!15832
| * | | Bugfix: User can't change the access level of an access requesterRubén Dávila2017-12-112-0/+39
| | |/ | |/| | | | | | | | | | The endpoint was returning 404 because it was only searching on the current members of a Group or Project and not the access requesters.
* | | Merge branch 'mk-pick-10-2-4-security-fixes' into 'master'Winnie Hellmann2017-12-117-37/+188
|\ \ \ | |_|/ |/| | | | | | | | Pick 10.2.4 security fixes into master See merge request gitlab-org/gitlab-ce!15821
| * | Merge branch 'note-preview' into 'security-10-2'Fatih Acet2017-12-081-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | prevent potential XSS when editing comment See merge request gitlab/gitlabhq!2238 (cherry picked from commit 80ed6d25a46c0f70ec8baea78b5777118d63876c) 7480e462 prevent potential XSS when editing comment
| * | Merge branch 'issue_30663' into 'security-10-2'Sean McGivern2017-12-081-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent creating issues through API without having permissions See merge request gitlab/gitlabhq!2225 (cherry picked from commit c298bbaa88883343dc9cbbb6abec0808fb3b546c) 915b97c5 Prevent creating issues through API without having permissions
| * | Merge branch 'rs-security-group-api' into 'security-10-2'Douwe Maan2017-12-081-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | [10.2] Ensure we expose group projects using GroupProjectsFinder See merge request gitlab/gitlabhq!2234 (cherry picked from commit 072f8f2fd6ec794645375a16ca4ddc1cbeb76d7a) a2240338 Ensure we expose group projects using GroupProjectsFinder
| * | Merge branch 'bvl-10-2-email-disclosure' into 'security-10-2'Douwe Maan2017-12-082-28/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (10.2) Avoid partial partial email adresses for matching See merge request gitlab/gitlabhq!2232 (cherry picked from commit 081aa1e91a777c9acb31be4a1e76b3dd7032fa9a) There are unresolved conflicts in app/models/user.rb. fa85a3fd Don't allow searching for partial user emails
| * | Merge branch '36679-non-authorized-user-may-see-wikis-or-pipeline-page' into ↵Douwe Maan2017-12-082-9/+69
| |/ | | | | | | | | | | | | | | | | | | | | 'security-10-2' Fixes project visibility guidelines See merge request gitlab/gitlabhq!2226 (cherry picked from commit 877c42c0aaf3298d6001614c9706bc366ae4014c) e4fd1c26 Ensure project wiki visibility guidelines are met
* | Fix image view modeClement Ho2017-12-111-0/+12
| |
* | 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
| |
* | Fix failing importer test case on MySQL due to missing trailing slash in ↵sh-fix-import-rake-taskStan Hu2017-12-082-0/+11
| | | | | | | | root path
* | Fix gitlab:import:repos Rake task moving repositories into the wrong locationStan Hu2017-12-081-0/+14
|/ | | | | | | | | | 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
* Allow git pull/push on project redirectsMayra Cabrera2017-12-088-31/+318
|
* Merge branch '38032-deploy-markers-should-be-more-verbose' into 'master'Mike Greiling2017-12-083-3/+46
|\ | | | | | | | | | | | | Resolve "Deploy markers should be more verbose" Closes #38032 See merge request gitlab-org/gitlab-ce!15641
| * Changed the deploy markers on the prometheus dashboard to be more verboseJose Ivan Vargas2017-12-073-3/+46
| |
* | Merge branch 'jprovazn-ignore-anchors' into 'master'Sean McGivern2017-12-082-0/+16
|\ \ | | | | | | | | | | | | | | | | | | Use prefix for TableOfContents filter hrefs Closes #38473 See merge request gitlab-org/gitlab-ce!15806
| * | Use prefix for TableOfContents filter hrefsJan Provaznik2017-12-082-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-089-37/+275
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-083-9/+189
| | | |
| * | | Implement and use Gitlab::Ci::Pipeline::Chain::CommandKamil Trzcinski2017-12-087-45/+50
| | | |
| * | | Fix invalid pipeline build chain tag evaluationGrzegorz Bizon2017-12-082-2/+55
| | | |
* | | | Resolve "No feedback when checking on checklist if potential spam was detected"Luke Bennett2017-12-084-5/+109
| | | |
* | | | Move the circuitbreaker check out in a separate processbvl-circuitbreaker-processBob Van Landuyt2017-12-0820-196/+460
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-081-0/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-071-0/+25
| | | | |
* | | | | 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 '40825-use-relative-path-urls' into 'master'Robert Speicher2017-12-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40825
* | | | | | Merge branch 'acet-fix-branches-list-on-cherry-pick-modal-after-merge' into ↵Jacob Schatz2017-12-071-0/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-041-0/+12
| | | | | | |
* | | | | | | 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-071-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix #39233 - 500 in merge request Closes #39233 See merge request gitlab-org/gitlab-ce!15774
| * | | | | | | | fix #39233 - 500 in merge requestMartin Nowak2017-12-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - handle unchanged empty lines in inline diff
* | | | | | | | | Merge branch 'feature/sm/34834-missing-dependency-should-fail-job-2' into ↵Kamil Trzciński2017-12-073-1/+174
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Dependency validator Closes #34834 See merge request gitlab-org/gitlab-ce!14009
| * | | | | | | | 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-072-2/+2
| | | | | | | | |
| * | | | | | | | Fix pipelineShinya Maeda2017-12-061-1/+3
| | | | | | | | |
| * | | | | | | | Fix testsShinya Maeda2017-12-062-28/+32
| | | | | | | | |