diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 00:09:34 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 00:09:34 +0000 |
| commit | 5781a4966047232d4725f9ee4769c4bd5aed9b26 (patch) | |
| tree | 0ef2b81a40931ec51f8fdd5284ed9e47cf42a923 /spec/features/merge_request | |
| parent | 4d48b3cfcd74bcca0f0f305746f74cf7224dd78b (diff) | |
| download | gitlab-ce-5781a4966047232d4725f9ee4769c4bd5aed9b26.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/merge_request')
| -rw-r--r-- | spec/features/merge_request/user_sees_diff_spec.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/spec/features/merge_request/user_sees_diff_spec.rb b/spec/features/merge_request/user_sees_diff_spec.rb index 2ef4a18f78d..868451883d8 100644 --- a/spec/features/merge_request/user_sees_diff_spec.rb +++ b/spec/features/merge_request/user_sees_diff_spec.rb @@ -61,10 +61,6 @@ describe 'Merge request > User sees diff', :js do let(:merge_request) { create(:merge_request_with_diffs, source_project: forked_project, target_project: project, author: author_user) } let(:changelog_id) { Digest::SHA1.hexdigest("CHANGELOG") } - before do - forked_project.repository.after_import - end - context 'as author' do it 'shows direct edit link', :sidekiq_might_not_need_inline do sign_in(author_user) |