diff options
| author | mo khan <mo@mokhan.ca> | 2016-05-01 17:44:33 -0600 |
|---|---|---|
| committer | mo khan <mo@mokhan.ca> | 2016-05-01 17:44:33 -0600 |
| commit | 9e66649d97ab9d00a7b41cf420d96d4c8af2f930 (patch) | |
| tree | e615e7b5a11a416269984e2c9bf5e2312b3ec41f /app | |
| parent | 115dfe33d4c1562d16791bf532da9dfe32919a22 (diff) | |
add capybara spec for loading gyms.
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/gyms_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/app/controllers/gyms_controller.rb b/app/controllers/gyms_controller.rb index f80b2da..7dc190a 100644 --- a/app/controllers/gyms_controller.rb +++ b/app/controllers/gyms_controller.rb @@ -1,6 +1,6 @@ class GymsController < ApplicationController def index - @gyms = Gym.closest_to(current_session.location) + @gyms = Gym.closest_to(current_session.location).includes(:location) end def new diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 12d7679..9c7bc1b 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -72,8 +72,6 @@ <ul class="inline-list right"> <li><a href="https://twitter.com/Stronglifters/">Twitter</a></li> <li><a href="https://github.com/stronglifters">Github</a></li> - <li><a href="#">Link 3</a></li> - <li><a href="#">Link 4</a></li> </ul> </div> </div> |