summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Show clusters of ancestors in cluster list pageThong Kuah2018-12-171-0/+61
| | | | | Show both the cluster(s) of the clusterable, and the cluster(s) of ancestor groups.
* Merge branch ↵53225-rendering-and-usability-problems-with-ie-1153104-redesign-group-overview-ui-mvcStan Hu2018-12-161-3/+4
|\ | | | | | | | | | | | | | | | | '55402-broken-master-karma-test-failing-in-spec-javascripts-boards-components-issue_due_date_spec-js' into 'master' Resolve "Broken master: karma test failing in spec/javascripts/boards/components/issue_due_date_spec.js" Closes #55402 See merge request gitlab-org/gitlab-ce!23845
| * Fix broken karma testMartin Wortschack2018-12-151-3/+4
| |
* | Merge branch '54786-mr-empty-file-display' into 'master'Nick Thomas2018-12-153-1/+129
|\ \ | |/ |/| | | | | | | | | Display empty files properly on MR diffs Closes #54786 See merge request gitlab-org/gitlab-ce!23671
| * Fix diff table rendering for empty files and improve testsSean Nichols2018-12-131-5/+13
| |
| * Fix redundant returns in spec fileSean Nichols2018-12-131-3/+3
| |
| * Add tests and move empty file message into own componentSean Nichols2018-12-133-1/+121
| |
* | Merge branch 'rs-transient-help-page-failure' into 'master'Stan Hu2018-12-152-15/+15
|\ \ | | | | | | | | | | | | | | | | | | Resolve transient failure in Help page spec Closes #55372 See merge request gitlab-org/gitlab-ce!23839
| * | Resolve transient failure in Help page specRobert Speicher2018-12-141-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes due to a slow request to load the version check image, the placeholder image data was still being seen, resulting in this failure: expected "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" to end with "/version-check-url" Now we check the `data-src` attribute, which allows us to remove the `:js` metadata. This commit also removes a redundant test, which was just ensuring that the selector we were already using in the other test is visible. If this test were failing, the other one would always fail too, so it was pointless. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55372
| * | Use class methods for VersionCheckRobert Speicher2018-12-142-8/+9
| | | | | | | | | | | | | | | | | | | | | All of these methods are stateless, there was no point to have them as instance methods. Mostly this allows us to remove an `allow_any_instance_of` usage.
* | | Merge branch '47052-merge-button-does-not-appear-after-rebase-ing' into 'master'Mike Greiling2018-12-143-11/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Merge button does not appear after Rebase-ing" Closes #47052 See merge request gitlab-org/gitlab-ce!23572
| * | | Set cached MRWidget SHA after rebaseSam Bigelow2018-12-143-11/+18
| | | | | | | | | | | | | | | | | | | | | | | | Update changelog to include Merge Request ID and Author Update changelog to include Merge Request ID and Author
* | | | Merge branch 'remove-rails4-support' into 'master'Stan Hu2018-12-144-20/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove Rails 4 support See merge request gitlab-org/gitlab-ce!23717
| * | | | Remove rails 4 support in CI, Gemfiles, bin/ and config/Jasper Maes2018-12-144-20/+4
| | |/ / | |/| |
* | | | Resolve a transient failure in MWPS feature specRobert Speicher2018-12-141-0/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | When this spec is run in a certain order, there appeared to be a timing issue with opening the "Merge when pipeline succeeds" drop-down menu. We now explicitly wait for any pending requests to complete before clicking the drop-down. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/6770
* | | Merge branch 'fix-warnings' into 'master'Robert Speicher2018-12-144-22/+48
|\ \ \ | | | | | | | | | | | | | | | | Fix warnings in tests See merge request gitlab-org/gitlab-ce!23788
| * | | Fix warning: already initialized constant STATUSESSemyon Pupkov2018-12-132-15/+37
| | | | | | | | | | | | | | | | | | | | spec/lib/gitlab/background_migration/migrate_stage_status_spec.rb:9: warning: already initialized constant STATUSES spec/lib/gitlab/background_migration/migrate_build_stage_spec.rb:9: warning: previous definition of STATUSES was here
| * | | Fix warning already initialized constant LABEL_TITLESSemyon Pupkov2018-12-132-7/+11
| | | | | | | | | | | | | | | | | | | | spec/features/projects/labels/user_views_labels_spec.rb:7: warning: already initialized constant LABEL_TITLES spec/features/issues/user_creates_issue_spec.rb:67: warning: previous definition of LABEL_TITLES was here
* | | | Merge branch '53771-move-cluster-type-description' into 'master'Kamil Trzciński2018-12-141-0/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move description of cluster type to presenter Closes #53771 See merge request gitlab-org/gitlab-ce!23789
| * | | | Move description of cluster type to presenterThong Kuah2018-12-131-0/+14
| | |_|/ | |/| |
* | | | Merge branch 'remove-issue-suggestions-flag' into 'master'Douwe Maan2018-12-141-0/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove issue_suggestions feature flag Closes #55166 See merge request gitlab-org/gitlab-ce!23723
| * | | | Pass on arguments passed to the FeatureConstrainerBob Van Landuyt2018-12-141-0/+11
| | |/ / | |/| | | | | | | | | | | | | | All arguments passed to the `FeatureConstrainer` will be passed on to the `Feature.enabled?` check.
* | | | Merge branch 'ac-releases-name-sha-author' into 'master'Kamil Trzciński2018-12-147-0/+35
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add name, author and sha to releases See merge request gitlab-org/gitlab-ce!23763
| * | | | Add name, author and sha to releasesAlessio Caiazza2018-12-137-0/+35
| |/ / / | | | | | | | | | | | | | | | | | | | | This commit adds a name to each release, defaulting it to tag name, keeps track of the SHA when a new release is created and tracks the current user as release author.
* | | | Display reply field if resolved discussion has no repliesWinnie Hellmann2018-12-141-0/+10
| | | |
* | | | Merge branch '52424-goodbye-hipchat-dependency-1' into 'master'Sean McGivern2018-12-141-14/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Stop using HipChat in the ServicesController spec See merge request gitlab-org/gitlab-ce!23774
| * | | | Stop using HipChat in the ServicesController specNick Thomas2018-12-131-14/+24
| | | | |
* | | | | Creates Vue component to render each release blockFilipa Lacerda2018-12-141-0/+148
| | | | |
* | | | | Merge branch ↵Phil Hughes2018-12-141-0/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '55344-only-prompt-user-once-when-navigating-away-from-file-editor' into 'master' Resolve "Only prompt user once when navigating away from file editor" Closes #55344 See merge request gitlab-org/gitlab-ce!23820
| * | | | | Remove beforeunload listener for cancel buttonSam Bigelow2018-12-131-0/+7
| | |_|_|/ | |/| | |
* | | | | Merge branch 'triggermesh-knative-version' into 'master'Kamil Trzciński2018-12-141-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Knative from 0.1.3 to 0.2.2 See merge request gitlab-org/gitlab-ce!23808
| * | | | | Upgrade Knative from 0.1.3 to 0.2.2Chris Baumbauer2018-12-111-3/+3
| | | | | |
* | | | | | Merge branch 'deprecated-delete-all-params' into 'master'Stan Hu2018-12-141-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix deprecation: Passing conditions to delete_all is deprecated See merge request gitlab-org/gitlab-ce!23817
| * | | | | | Fix deprecation: Passing conditions to delete_all is deprecatedJasper Maes2018-12-131-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'bw-fix-missing-board-milestone' into 'master'Robert Speicher2018-12-141-6/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Issue boards don't show milestone in issue details See merge request gitlab-org/gitlab-ce!23813
| * | | | | | Use proper API::Entities::MilestoneBrett Walker2018-12-131-6/+25
| | | | | | |
* | | | | | | Merge remote-tracking branch 'dev/master'Alex Hanselka2018-12-131-0/+12
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * dev/master: Update CHANGELOG.md for 11.3.13 Validate LFS hrefs before downloading them
| * | | | | | Merge branch 'security-2754-fix-lfs-import' into 'master'Alex Hanselka2018-12-131-0/+12
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [MASTER]: Validate LFS hrefs before downloading them Closes #2754 See merge request gitlab/gitlabhq!2696
| | * | | | | Validate LFS hrefs before downloading themNick Thomas2018-12-111-0/+12
| | | | | | |
* | | | | | | Allow suggesting single line changes in diffsOswaldo Ferreira2018-12-1323-5/+1050
|/ / / / / /
* | | | | | Merge branch '51994-disable-merging-labels-in-dropdowns' into 'master'Fatih Acet2018-12-134-172/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Fix labels dropdown with multiple same names" Closes #51994 See merge request gitlab-org/gitlab-ce!23265
| * | | | | | Fix failed tests and add extra testHeinrich Lee Yu2018-12-062-3/+22
| | | | | | |
| * | | | | | Disable duplicate label merging in search bar dropdownHeinrich Lee Yu2018-12-062-169/+0
| | | | | | |
* | | | | | | Merge branch 'diff-empty-state-fixes' into 'master'Filipa Lacerda2018-12-132-25/+107
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix diff changes empty state Closes #48635 See merge request gitlab-org/gitlab-ce!23767
| * | | | | | | Fix diff changes empty statePhil Hughes2018-12-132-25/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The empty state now only gets shown when no files exist in the branch. If the user is reviewing 2 versions with no files, we don't show the state. Refactors the diff app spec to use Vue test utils. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48635
* | | | | | | | Add List-Id to notification emailsOlivier Crête2018-12-132-1/+58
| | | | | | | |
* | | | | | | | Merge branch 'zj-backup-restore-object-pools' into 'master'Douwe Maan2018-12-132-0/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore Object Pools when restoring an object pool Closes gitaly#1355 See merge request gitlab-org/gitlab-ce!23682
| * | | | | | | | Restore Object Pools when restoring an object poolZeger-Jan van de Weg2018-12-132-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pool repositories are persisted in the database, and when the DB is restored, the data need to be restored on disk. This is done by resetting the state machine and rescheduling the object pool creation. This is not an exact replica of the state like at the time of the creation of the backup. However, the data is consistent again. Dumping isn't required as internally GitLab uses git bundles which bundle all refs and include all objects in the bundle that they require, reduplicating as more repositories get backed up. This does require more data to be stored. Fixes https://gitlab.com/gitlab-org/gitaly/issues/1355
* | | | | | | | | Re-define default only except policyKamil Trzciński2018-12-138-203/+207
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Added testPhil Hughes2018-12-121-0/+81
| | | | | | | |