diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-09-01 15:28:14 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-09-01 15:28:14 +0000 |
commit | d308a3f4335845d88cbb4fbfbea9d72fa2473769 (patch) | |
tree | d9b53fc90b0db5416b2eb78b56766aec646a2095 /spec/lib/gitlab/github_import | |
parent | ae439a62cca06fdc719d53dd32e7235cf219c3c7 (diff) | |
parent | 892dea67717c0efbd6a28f7639f34535ec0a8747 (diff) | |
download | gitlab-ce-d308a3f4335845d88cbb4fbfbea9d72fa2473769.tar.gz |
Merge branch 'issue_19734' into 'master'
Project tools visibility level
## part of #19734
![project_features_access_level](/uploads/81ec7185d4e61d7578652020209af925/project_features_access_level.png)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5606
Diffstat (limited to 'spec/lib/gitlab/github_import')
-rw-r--r-- | spec/lib/gitlab/github_import/importer_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/github_import/importer_spec.rb b/spec/lib/gitlab/github_import/importer_spec.rb index b7c3bc4e1a7..3fb8de81545 100644 --- a/spec/lib/gitlab/github_import/importer_spec.rb +++ b/spec/lib/gitlab/github_import/importer_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe Gitlab::GithubImport::Importer, lib: true do describe '#execute' do context 'when an error occurs' do - let(:project) { create(:project, import_url: 'https://github.com/octocat/Hello-World.git', wiki_enabled: false) } + let(:project) { create(:project, import_url: 'https://github.com/octocat/Hello-World.git', wiki_access_level: ProjectFeature::DISABLED) } let(:octocat) { double(id: 123456, login: 'octocat') } let(:created_at) { DateTime.strptime('2011-01-26T19:01:12Z') } let(:updated_at) { DateTime.strptime('2011-01-27T19:01:12Z') } |