summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Look up upstream commits once before queuing ProcessCommitWorkersDouwe Maan2019-08-162-50/+60
| | | | | | | | Instead of checking if a commit already exists in the upstream project in its ProcessCommitWorker and bailing out if it does, we check the existence of all commits in bulk in Git::BranchHooksService, so that we can skip scheduling ProcessCommitWorker jobs for those commits that already exist upstream entirely.
* Return 429 on rate limiter on raw endpointMayra Cabrera2019-08-132-3/+42
| | | | | | | | It was originally returning 302 when the rate limit kicks in, because using the the correct status code makes it easier to track rate limiting events Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/65974
* Merge branch '65803-invalidate-branches-cache-on-refresh' into 'master'Bob Van Landuyt2019-08-133-7/+89
|\ | | | | | | | | Only expire branch cache once per push See merge request gitlab-org/gitlab-ce!31653
| * Rename branches_exist? -> includes_branches?65803-invalidate-branches-cache-on-refreshStan Hu2019-08-092-7/+12
| |
| * Invalidate branches cache on PostReceivePatrick Bajao2019-08-093-6/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever `PostReceive` is enqueued, `UpdateMergeRequestsWorker` is enqueued and `MergeRequests::RefreshService` is called, it'll check if the source branch of each MR asssociated to the push exists or not via `MergeRequest#source_branch_exists?`. The said method will call `Repository#branch_exists?` which is cached in `Rails.cache`. When the cache contains outdated data and the source branch actually exists, the `MergeRequests#RefreshService` job will close associated MRs which is not correct. The fix is to expire the branches cache of the project so we have updated data during the post receive hook which will help in the accuracy of the check if we need to close associated MRs or not.
* | Merge branch 'fix-filename-length' into 'master'Rémy Coutable2019-08-131-1/+1
|\ \ | | | | | | | | | | | | Ensure changelog filenames have length less than 99 characters See merge request gitlab-org/gitlab-ce!31752
| * | Ensure changelog filenames are less than 99 characters longfix-filename-lengthBalasankar "Balu" C2019-08-131-1/+1
| | | | | | | | | | | | Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
* | | Merge branch 'require-stage-to-be-set-with-needs' into 'master'Grzegorz Bizon2019-08-132-4/+39
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Require `stage:` to be set with `needs:` Closes #65568 See merge request gitlab-org/gitlab-ce!31760
| * | | Require `stage:` to be set with `needs:`Kamil Trzciński2019-08-132-4/+39
| | | | | | | | | | | | | | | | | | | | | | | | Since we are unsure what would be the behavior of `stage:` when we work on DAG. Let's make `stage:` to be required today with `needs:`.
* | | | Merge branch '65963-avoid-extra-query-allowed-to-uninstall' into 'master'Nick Thomas2019-08-131-1/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a performance issue in Helm#can_uninstall? Closes #65963 See merge request gitlab-org/gitlab-ce!31751
| * | | | Fix performance issue in Helm#can_uninstall?65963-avoid-extra-query-allowed-to-uninstallDylan Griffith2019-08-131-1/+9
| | |/ / | |/| | | | | | | | | | | | | | | | | | Calling #present? was causing a DB query to happen each time around the loop. We only wanted to check for nil as it's nil in the first loop around so there is no need for #present?
* | | | Merge branch 'remove-build-process-worker' into 'master'Grzegorz Bizon2019-08-131-26/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Remove unused `BuildProcessWorker` Closes #65539 See merge request gitlab-org/gitlab-ce!31756
| * | | Remove unused `BuildProcessWorker`Kamil Trzciński2019-08-131-26/+0
| | | | | | | | | | | | | | | | | | | | We migrated all logic to `PipelineProcessWorker` and this worker become redundant.
* | | | Merge branch 'spec_cluster_policy_coverage' into 'master'Bob Van Landuyt2019-08-132-0/+12
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Improve cluster policy spec coverage See merge request gitlab-org/gitlab-ce!31700
| * | | Improve cluster policy spec coveragespec_cluster_policy_coverageThong Kuah2019-08-122-0/+12
| | | |
* | | | Merge branch '61800-migrate-environment-rollback-tests-to-jest' into 'master'Tim Zallmann2019-08-134-20/+53
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Convert `spec/javascripts/environments/*rollback*` tests from Jasmine to Jest Closes #61800 See merge request gitlab-org/gitlab-ce!31021
| * | | Convert spec/javascripts/environments/*rollback* tests to Jest61800-migrate-environment-rollback-tests-to-jestNathan Friend2019-08-124-20/+53
| | | | | | | | | | | | | | | | This commit converts two Jasmine tests into Jest tests.
* | | | Improve quick action error messagesHeinrich Lee Yu2019-08-132-19/+19
| | | | | | | | | | | | | | | | Standardize punctuation and format
* | | | Merge branch 'ce-12547-load-search-counts-async' into 'master'Michael Kozono2019-08-129-92/+294
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Load search result counts asynchronously (CE) See merge request gitlab-org/gitlab-ce!31663
| * | | | FE fetch counts async on search page loadPaul Slaughter2019-08-122-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | Creates `refresh_counts` module to dynamically fetch and load data based on attributes of HAML elements.
| * | | | Load search result counts asynchronouslyMarkus Koller2019-08-127-92/+252
| |/ / / | | | | | | | | | | | | | | | | | | | | Querying all counts for the different search results in the same request led to timeouts, so we now only calculate the count for the *current* search results, and request the others in separate asynchronous calls.
* | | | Merge branch 'sh-fix-import-export-suggestions' into 'master'Michael Kozono2019-08-122-1/+22
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Properly save suggestions in project exports Closes #65880 See merge request gitlab-org/gitlab-ce!31690
| * | | Properly save suggestions in project exportssh-fix-import-export-suggestionsStan Hu2019-08-102-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously imports would fail if a merge request note included a suggestion with an `ActiveRecord::HasManyThroughCantAssociateThroughHasOneOrManyReflection` exception. This was happening because suggestions were listed as a descendant of merge requests, but this doesn't work because suggestions are directly associated with notes, not merge requests, and that association is lost. Rails also disallows creating intializing a has_many association through a different object. We fix this by making `suggestions` a child of `notes` within a merge request. This doesn't fix previously broken exported project exports, but new exports will work. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/65880
* | | | Merge branch '65790-highlight' into 'master'Annabel Dunstone Gray2019-08-121-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds highlight to collapsible line in job log Closes #65790 See merge request gitlab-org/gitlab-ce!31665
| * | | | Adds highlight to collapsible lineFilipa Lacerda2019-08-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | In the job log adds a highlight when hovering the collapsible line
* | | | | Merge branch 'update-graphicsmagick-to-1.3.33' into 'master'Stan Hu2019-08-121-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update GraphicsMagick from 1.3.29 to 1.3.33 See merge request gitlab-org/gitlab-ce!31692
| * | | | | Update GraphicsMagick from 1.3.29 to 1.3.33 for CI testsTakuya Noguchi2019-08-121-2/+2
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | Merge branch '65278-fix-puma-master-counter-wipe' into 'master'Stan Hu2019-08-121-3/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix active metric files being wiped after the app starts See merge request gitlab-org/gitlab-ce!31668
| * | | | | Remove worker label from puma terminations metric65278-fix-puma-master-counter-wipeAleksei Lipniagov2019-08-121-3/+1
| | |/ / / | |/| | |
* | | | | Update Gitaly server and gem to 1.58.0Jacob Vosmaer2019-08-121-17/+0
| | | | |
* | | | | Merge branch 'georgekoltsov/63408-user-mapping' into 'master'Grzegorz Bizon2019-08-124-11/+34
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add author lines to project import comments See merge request gitlab-org/gitlab-ce!31579
| * | | | | Apply code review feedbackGeorge Koltsov2019-08-081-2/+2
| | | | | |
| * | | | | Add bitbucket_import/importer_spec.rb specGeorge Koltsov2019-08-074-11/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Replace `username` field with `nickname` due to updates in BitBucket Cloud API - Add new imported spec validating addition of `authod_line`
* | | | | | Merge branch 'georgekoltsov/51260-add-filtering-to-bitbucket-server-import' ↵Tim Zallmann2019-08-122-1/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add BitBucketServerImport project filtering See merge request gitlab-org/gitlab-ce!31420
| * | | | | | Add BitbucketServerController filtering specGeorge Koltsov2019-08-121-1/+13
| | | | | | |
| * | | | | | Add bitbucket_server/client_spec.rb specGeorge Koltsov2019-08-121-0/+11
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'alipniagov-fix-wiki_can_not_be_created_total-counter' into ↵Thong Kuah2019-08-121-1/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix :wiki_can_not_be_created_total counter See merge request gitlab-org/gitlab-ce!31673
| * | | | | Fix :wiki_can_not_be_created_total counteralipniagov-fix-wiki_can_not_be_created_total-counterAleksei Lipniagov2019-08-091-1/+4
| | | | | |
* | | | | | Merge branch ↵docs-4453-external-exportersFilipa Lacerda2019-08-121-47/+64
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '44036-someone-edited-the-issue-at-the-same-time-is-regularly-seen-despite-that-being-a-filthy-lie' into 'master' Fix incorrectly displayed conflict warning See merge request gitlab-org/gitlab-ce!31469
| * | | | | | Fix conflict warning being incorrectly displayed44036-someone-edited-the-issue-at-the-same-time-is-regularly-seen-despite-that-being-a-filthy-lieHeinrich Lee Yu2019-08-121-47/+64
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Hide warning when update request is in progress
* | | | | | Merge branch 'sh-break-out-invited-group-members' into 'master'Ash McKenzie2019-08-127-23/+73
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it easier to find invited group members Closes #61948 See merge request gitlab-org/gitlab-ce!28436
| * | | | | | Improve spec description in member_spec.rbsh-break-out-invited-group-membersStan Hu2019-08-111-1/+1
| | | | | | |
| * | | | | | Fix typo in causing failing to test in sorting_spec.rbStan Hu2019-08-091-1/+1
| | | | | | |
| * | | | | | Merge branch 'master' into sh-break-out-invited-group-membersStan Hu2019-08-0984-593/+2167
| |\ \ \ \ \ \
| * | | | | | | Rename search_invited to search_invite_emailStan Hu2019-08-091-2/+4
| | | | | | | |
| * | | | | | | Merge branch 'master' into sh-break-out-invited-group-membersStan Hu2019-08-0778-605/+1570
| |\ \ \ \ \ \ \
| * | | | | | | | Fix broken specsMartin Wortschack2019-08-064-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Add qa- selector to sort dropdown
| * | | | | | | | Fix spec for inviting membersStan Hu2019-08-051-0/+2
| | | | | | | | |
| * | | | | | | | Make it easier to find invited group membersStan Hu2019-08-054-2/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We had a number of team members struggle to find invited members of a group. Searching for the e-mail address did not work because search only works with members with user accounts. This commit changes two things: 1. Breaks out the invited members into a separate table. 2. Adds search capability for the invited members. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/61948
* | | | | | | | | Merge branch 'fe-fix-diffs-specs-leaking-store' into 'master'Kushal Pandya2019-08-1211-22/+26
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE] FE fix diffs specs leaking store See merge request gitlab-org/gitlab-ce!31698