diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-02-20 01:12:59 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-02-20 01:12:59 +0000 |
| commit | 0c5abb1e0ba87a9e8c28dfc2f1cf455cf5b64ab9 (patch) | |
| tree | 3a8a9a79c0ff08512783ee64b18ea3cf6a3290ac /spec/controllers | |
| parent | 3a97a5ddfd4618fa675a416a00e0c807edb974ca (diff) | |
| parent | dfca5bfa47fa3adcdd8f80ebe92905d1e533b842 (diff) | |
| download | gitlab-ce-0c5abb1e0ba87a9e8c28dfc2f1cf455cf5b64ab9.tar.gz | |
Merge branch 'rs-move-controller-specs' into 'master'
Move a few controller specs to their correct locations
See merge request !2889
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/profiles/keys_controller_spec.rb (renamed from spec/controllers/profile_keys_controller_spec.rb) | 0 | ||||
| -rw-r--r-- | spec/controllers/projects/blame_controller_spec.rb (renamed from spec/controllers/blame_controller_spec.rb) | 0 | ||||
| -rw-r--r-- | spec/controllers/projects/branches_controller_spec.rb (renamed from spec/controllers/branches_controller_spec.rb) | 0 | ||||
| -rw-r--r-- | spec/controllers/projects/commits_controller_spec.rb (renamed from spec/controllers/commits_controller_spec.rb) | 0 | ||||
| -rw-r--r-- | spec/controllers/sent_notifications_controller_spec.rb (renamed from spec/controllers/sent_notification_controller_spec.rb) | 0 |
5 files changed, 0 insertions, 0 deletions
diff --git a/spec/controllers/profile_keys_controller_spec.rb b/spec/controllers/profiles/keys_controller_spec.rb index b6573f105dc..b6573f105dc 100644 --- a/spec/controllers/profile_keys_controller_spec.rb +++ b/spec/controllers/profiles/keys_controller_spec.rb diff --git a/spec/controllers/blame_controller_spec.rb b/spec/controllers/projects/blame_controller_spec.rb index 25f06299a29..25f06299a29 100644 --- a/spec/controllers/blame_controller_spec.rb +++ b/spec/controllers/projects/blame_controller_spec.rb diff --git a/spec/controllers/branches_controller_spec.rb b/spec/controllers/projects/branches_controller_spec.rb index 8e06d4bdc77..8e06d4bdc77 100644 --- a/spec/controllers/branches_controller_spec.rb +++ b/spec/controllers/projects/branches_controller_spec.rb diff --git a/spec/controllers/commits_controller_spec.rb b/spec/controllers/projects/commits_controller_spec.rb index 7d8089c4bc6..7d8089c4bc6 100644 --- a/spec/controllers/commits_controller_spec.rb +++ b/spec/controllers/projects/commits_controller_spec.rb diff --git a/spec/controllers/sent_notification_controller_spec.rb b/spec/controllers/sent_notifications_controller_spec.rb index 9ced397bd4a..9ced397bd4a 100644 --- a/spec/controllers/sent_notification_controller_spec.rb +++ b/spec/controllers/sent_notifications_controller_spec.rb |