summaryrefslogtreecommitdiff
path: root/spec/features/calendar_spec.rb
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-07-28 15:26:00 +0100
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-07-28 15:26:00 +0100
commitdc04fdc1a3165134fc9245e9a591daceee857ef4 (patch)
treee3b01475f2e224cd1595167c9a5dd0d0dc013a89 /spec/features/calendar_spec.rb
parentec302c6c0cf7d4b3a19bea43ce380dbaa60b363d (diff)
parent48c51e207e4cba8a69e4ca65cba1e169d384cefa (diff)
downloadgitlab-ce-dc04fdc1a3165134fc9245e9a591daceee857ef4.tar.gz
Merge remote-tracking branch 'origin/master' into ide
Diffstat (limited to 'spec/features/calendar_spec.rb')
-rw-r--r--spec/features/calendar_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/calendar_spec.rb b/spec/features/calendar_spec.rb
index adbd82e3057..1e7fd7b62bd 100644
--- a/spec/features/calendar_spec.rb
+++ b/spec/features/calendar_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-feature 'Contributions Calendar', :feature, :js do
+feature 'Contributions Calendar', :js do
let(:user) { create(:user) }
let(:contributed_project) { create(:empty_project, :public) }
let(:issue_note) { create(:note, project: contributed_project) }