diff options
| author | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-12-07 21:15:06 +0300 |
|---|---|---|
| committer | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-12-14 21:36:22 +0300 |
| commit | 44fef4fe4cb9d4f30f129ff5a548395bc924c8fe (patch) | |
| tree | ac5e97a16658edfb25b8407f1cf2d9a11c172667 /spec/lib/gitlab/github_import | |
| parent | eafc8e2f481751b973260287c844b70bd408dcb2 (diff) | |
Remove rails 4 support in CI, Gemfiles, bin/ and config/
Diffstat (limited to 'spec/lib/gitlab/github_import')
| -rw-r--r-- | spec/lib/gitlab/github_import/importer/pull_request_importer_spec.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/spec/lib/gitlab/github_import/importer/pull_request_importer_spec.rb b/spec/lib/gitlab/github_import/importer/pull_request_importer_spec.rb index efca8564894..25684ea9e2c 100644 --- a/spec/lib/gitlab/github_import/importer/pull_request_importer_spec.rb +++ b/spec/lib/gitlab/github_import/importer/pull_request_importer_spec.rb @@ -240,12 +240,7 @@ describe Gitlab::GithubImport::Importer::PullRequestImporter, :clean_gitlab_redi .and_return(user.id) end - # TODO: remove rails5-only after removing rails4 tests - # rails 4 can not handle multiple indexes on the same column set if - # index was added by 't.index' - t.index is used by default in schema.rb in - # rails 5. Let's run this test only in rails 5 env: - # see https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21492#note_113602758 - it 'returns the existing merge request', :rails5 do + it 'returns the existing merge request' do mr1, exists1 = importer.create_merge_request mr2, exists2 = importer.create_merge_request |