diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-10-09 12:52:51 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-10-09 12:52:51 +0000 |
| commit | 2409acfa7f97fef81dd66640c64e9d0008b85cde (patch) | |
| tree | 1dcafa5cd5b4646ddaf6d736cc2a15d60d0f0c19 /spec/features/merge_requests/resolve_outdated_diff_discussions.rb | |
| parent | 0f366c74131339cb45c8943437fe5b3e68721c75 (diff) | |
| parent | f277fa14094e5515e2317d2baa1fa0bfb95966da (diff) | |
| download | gitlab-ce-2409acfa7f97fef81dd66640c64e9d0008b85cde.tar.gz | |
Merge branch 'master' into 'group-sort-dropdown-blank'
# Conflicts:
# spec/features/dashboard/group_spec.rb
Diffstat (limited to 'spec/features/merge_requests/resolve_outdated_diff_discussions.rb')
| -rw-r--r-- | spec/features/merge_requests/resolve_outdated_diff_discussions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/merge_requests/resolve_outdated_diff_discussions.rb b/spec/features/merge_requests/resolve_outdated_diff_discussions.rb index 55a82bdf2b9..25abbb469ab 100644 --- a/spec/features/merge_requests/resolve_outdated_diff_discussions.rb +++ b/spec/features/merge_requests/resolve_outdated_diff_discussions.rb @@ -1,6 +1,6 @@ require 'spec_helper' -feature 'Resolve outdated diff discussions', js: true do +feature 'Resolve outdated diff discussions', :js do let(:project) { create(:project, :repository, :public) } let(:merge_request) do |