From e134326b9cc6e075f9f9fb09876e308a77cc1fa3 Mon Sep 17 00:00:00 2001 From: Markus Graf Date: Thu, 21 Apr 2016 17:23:50 +0200 Subject: [PATCH] fixed infinit loop --- .gitignore | 1 + Gemfile.lock | 3 +++ app/controllers/admin/pages_controller.rb | 8 +++----- app/controllers/admin/supporters_controller.rb | 8 +++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 1c9ba94..f8f9ae3 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ # Ignore bundler config. /.bundle /.rspec +.ruby-version # Ignore all logfiles and tempfiles. /log/* diff --git a/Gemfile.lock b/Gemfile.lock index 67d39d2..f23be6f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -248,3 +248,6 @@ DEPENDENCIES turbolinks uglifier (>= 1.3.0) web-console (~> 2.0) + +BUNDLED WITH + 1.10.2 diff --git a/app/controllers/admin/pages_controller.rb b/app/controllers/admin/pages_controller.rb index 4e73e5b..05b80ad 100644 --- a/app/controllers/admin/pages_controller.rb +++ b/app/controllers/admin/pages_controller.rb @@ -1,7 +1,5 @@ -module Admin - class PagesController < Admin::ApplicationController - def map - @supporters = Supporter.where(:coordinates.ne => nil).only(:coordinates, :support) - end +class PagesController < Admin::ApplicationController + def map + @supporters = Supporter.where(:coordinates.ne => nil).only(:coordinates, :support) end end diff --git a/app/controllers/admin/supporters_controller.rb b/app/controllers/admin/supporters_controller.rb index 8965d4a..58b1209 100644 --- a/app/controllers/admin/supporters_controller.rb +++ b/app/controllers/admin/supporters_controller.rb @@ -1,7 +1,5 @@ -module Admin - class SupportersController < Admin::ApplicationController - def index - @supporters = Supporter.desc(:created_at) - end +class SupportersController < Admin::ApplicationController + def index + @supporters = Supporter.desc(:created_at) end end