diff options
| author | James Lopez <james@jameslopez.es> | 2016-07-11 18:00:19 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-07-11 18:00:19 +0200 |
| commit | feecb4afde4cde116bcdca9c9c5059cf201720f8 (patch) | |
| tree | a71159a68d6a98731e21307849e82acbfb089f97 /spec/controllers/users_controller_spec.rb | |
| parent | 0e5f0276eae25c975078f825ea10ff2c8d05563c (diff) | |
| parent | 36c60b4c269a3d60f6b3e0df3bf1bfc7d44a6b54 (diff) | |
| download | gitlab-ce-feecb4afde4cde116bcdca9c9c5059cf201720f8.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-event-error
Diffstat (limited to 'spec/controllers/users_controller_spec.rb')
| -rw-r--r-- | spec/controllers/users_controller_spec.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index 8d6f486efdd..54a2d3d9460 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -64,7 +64,6 @@ describe UsersController do end describe 'GET #calendar' do - it 'renders calendar' do sign_in(user) |