summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Add rake tasks for migrating leacy uploadslegacy-attachments-migrate-fixJarka Košanová2019-08-163-4/+360
| | | | | - move uploads created by AttachmentUploader - handle also files created for legacy_diff_notes
* 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
| * | | | | | | | CE - FE fix diffs specs leaking storefe-fix-diffs-specs-leaking-storePaul Slaughter2019-08-1111-22/+26
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Export mr_notes module as function - Update specs refs of mr_notes/stores to factory EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/15097
* | | | | | | | Add kbd shortcuts for discussion navigationSam Bigelow2019-08-122-0/+125
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Add keyboard shortcuts `p` and `n` to navigate duscussions.
* | | | | | | Update karma for new expansion cell markupAndré Luís2019-08-111-4/+12
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also cleans up spec by: - Add missing `afterEach ... $destroy` - Add missing `done` call when `$nextTick` was used
* | | | | | Replace ... with new expansion optionsSamantha Ming2019-08-1011-21/+238
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - expand upwards - expand downwards - expand all in both inline and parallel views
* | | | | | Split MR widget into cached and non-cached serializersIgor2019-08-095-143/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Splits auto-refreshing of MR widget into 2 requests: - the one which uses etag-caching and invalidates the fields on change - the one without caching The idea is to gradually move all the fields to etag-cached endpoint
* | | | | | Merge branch 'spec-differences' into 'master'Robert Speicher2019-08-091-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport EE code for OAuth applications spec See merge request gitlab-org/gitlab-ce!31670
| * | | | | | Backport EE code for OAuth applications specspec-differencesYorick Peterse2019-08-091-1/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | This spec used a different title for a spec in EE, while CE duplicated the same title. This ensures that CE uses the EE version.
* | | | | | Merge branch 'issue_58494' into 'master'Robert Speicher2019-08-091-0/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent rewritting plain links as embedded Closes #58494 See merge request gitlab-org/gitlab-ce!31489
| * | | | | | Prevent rewritting plain links as embeddedissue_58494Felipe Artur2019-08-071-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents rewritting plain image/video links as embedded when moving issues.
* | | | | | | Remove gfm_embed_metrics flag from BETristan Read2019-08-093-52/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes the feature flag that controls whether metrics dashboard urls unfurl the metrics dashboard charts.
* | | | | | | Adds button to download metrics data as csvLaura Montemayor2019-08-091-3/+33
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR adds a temporary button to be able to download the Prometheus metrics from charts to CSV format.
* | | | | | Merge branch ↵Bob Van Landuyt2019-08-091-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '13208-epicissue-has-an-unexpected-default-relative-position-ce' into 'master' [CE] Remove default `relative_position` from `epic_issues` See merge request gitlab-org/gitlab-ce!31514
| * | | | | | Remove default relative_position value13208-epicissue-has-an-unexpected-default-relative-position-ceHeinrich Lee Yu2019-08-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes `epic_issues` consistent with other tables using our `RelativePositioning` class
* | | | | | | Add repo-refs control for search pageminghuan lei2019-08-092-8/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - only in blobs result