diff --git a/app/controllers/admin/organization_users_controller.rb b/app/controllers/admin/organization_users_controller.rb index d25f42c9ff..16250a91d7 100644 --- a/app/controllers/admin/organization_users_controller.rb +++ b/app/controllers/admin/organization_users_controller.rb @@ -3,8 +3,6 @@ require_dependency 'google_plus_api' require_dependency 'google_plus_config' require_dependency 'carto/controller_helper' require_dependency 'dummy_password_generator' -require_dependency 'carto_gears_api/events/event_manager' -require_dependency 'carto_gears_api/events/user_events' class Admin::OrganizationUsersController < Admin::AdminController include OrganizationUsersHelper diff --git a/app/controllers/google_plus_controller.rb b/app/controllers/google_plus_controller.rb index 7b78e13206..9c72319816 100644 --- a/app/controllers/google_plus_controller.rb +++ b/app/controllers/google_plus_controller.rb @@ -1,7 +1,5 @@ # encoding: UTF-8 require_dependency 'google_plus_api' -require_dependency 'carto_gears_api/events/event_manager' -require_dependency 'carto_gears_api/events/user_events' class GooglePlusController < ApplicationController diff --git a/app/controllers/superadmin/users_controller.rb b/app/controllers/superadmin/users_controller.rb index 88703a37cd..905250d13d 100644 --- a/app/controllers/superadmin/users_controller.rb +++ b/app/controllers/superadmin/users_controller.rb @@ -1,8 +1,6 @@ require_relative '../../../lib/carto/http/client' require_dependency 'carto/uuidhelper' require_dependency 'carto/overquota_users_service' -require_dependency 'carto_gears_api/events/event_manager' -require_dependency 'carto_gears_api/events/user_events' class Superadmin::UsersController < Superadmin::SuperadminController include Carto::UUIDHelper diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 38cf0ec405..6f104d5dee 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,6 +1,5 @@ # coding: utf-8 require_dependency 'cartodb_config_utils' -require_dependency 'carto_gears_api/helpers/pages_helper' module ApplicationHelper include CartoDB::ConfigUtils diff --git a/app/models/carto/user_creation.rb b/app/models/carto/user_creation.rb index 4aaa060be0..bf863b335c 100644 --- a/app/models/carto/user_creation.rb +++ b/app/models/carto/user_creation.rb @@ -1,7 +1,5 @@ # encoding: UTF-8 require_dependency 'carto/user_authenticator' -require_dependency 'carto_gears_api/events/event_manager' -require_dependency 'carto_gears_api/events/user_events' class Carto::UserCreation < ActiveRecord::Base include Carto::UserAuthenticator diff --git a/gears/carto_gears_api/app/mailers/carto_gears_api/base_mail.rb b/gears/carto_gears_api/app/mailers/carto_gears_api/base_mail.rb index 10b077c41c..5aad67688d 100644 --- a/gears/carto_gears_api/app/mailers/carto_gears_api/base_mail.rb +++ b/gears/carto_gears_api/app/mailers/carto_gears_api/base_mail.rb @@ -1,5 +1,3 @@ -require_dependency 'carto_gears_api/config' - module CartoGearsApi module Mailers class BaseMail < ActionMailer::Base diff --git a/gears/carto_gears_api/lib/carto_gears_api/events/user_events.rb b/gears/carto_gears_api/lib/carto_gears_api/events/user_events.rb index fca3da0d53..0be667f80e 100644 --- a/gears/carto_gears_api/lib/carto_gears_api/events/user_events.rb +++ b/gears/carto_gears_api/lib/carto_gears_api/events/user_events.rb @@ -1,6 +1,3 @@ -require_dependency 'carto_gears_api/events/base_event' -require_dependency 'carto_gears_api/users/user' - module CartoGearsApi module Events # Event triggered when a user is created diff --git a/gears/carto_gears_api/lib/carto_gears_api/helpers/gear_controller_helper.rb b/gears/carto_gears_api/lib/carto_gears_api/helpers/gear_controller_helper.rb index 21debe6c7e..b0456b8a79 100644 --- a/gears/carto_gears_api/lib/carto_gears_api/helpers/gear_controller_helper.rb +++ b/gears/carto_gears_api/lib/carto_gears_api/helpers/gear_controller_helper.rb @@ -1,6 +1,3 @@ -require_dependency 'carto_gears_api/helpers/url_helper' -require_dependency 'carto_gears_api/users/users_service' - module CartoGearsApi module Helpers # This should be included in every controller using the following CARTO layouts: diff --git a/gears/carto_gears_api/lib/carto_gears_api/helpers/pages_helper.rb b/gears/carto_gears_api/lib/carto_gears_api/helpers/pages_helper.rb index f4b021999d..f6e44aadbe 100644 --- a/gears/carto_gears_api/lib/carto_gears_api/helpers/pages_helper.rb +++ b/gears/carto_gears_api/lib/carto_gears_api/helpers/pages_helper.rb @@ -1,5 +1,3 @@ -require_dependency 'carto_gears_api/pages/subheader' - module CartoGearsApi module Helpers module PagesHelper @@ -9,4 +7,3 @@ module CartoGearsApi end end end - diff --git a/gears/carto_gears_api/lib/carto_gears_api/notifications/notification.rb b/gears/carto_gears_api/lib/carto_gears_api/notifications/notification.rb index 9510512ddf..5c5b565ffd 100644 --- a/gears/carto_gears_api/lib/carto_gears_api/notifications/notification.rb +++ b/gears/carto_gears_api/lib/carto_gears_api/notifications/notification.rb @@ -1,5 +1,4 @@ require 'values' -require_dependency 'carto_gears_api/organizations/organization' module CartoGearsApi module Notifications diff --git a/gears/carto_gears_api/lib/carto_gears_api/notifications/notifications_service.rb b/gears/carto_gears_api/lib/carto_gears_api/notifications/notifications_service.rb index 7a5e16a830..c6fb9cb1fe 100644 --- a/gears/carto_gears_api/lib/carto_gears_api/notifications/notifications_service.rb +++ b/gears/carto_gears_api/lib/carto_gears_api/notifications/notifications_service.rb @@ -1,6 +1,3 @@ -require_dependency 'carto_gears_api/notifications/notification' -require_dependency 'carto_gears_api/errors' - module CartoGearsApi module Notifications class NotificationsService diff --git a/gears/carto_gears_api/lib/carto_gears_api/queue/jobs_service.rb b/gears/carto_gears_api/lib/carto_gears_api/queue/jobs_service.rb index ab5bd3d4c6..bc6914b385 100644 --- a/gears/carto_gears_api/lib/carto_gears_api/queue/jobs_service.rb +++ b/gears/carto_gears_api/lib/carto_gears_api/queue/jobs_service.rb @@ -1,5 +1,3 @@ -require_dependency 'carto_gears_api/queue/generic_job' - module CartoGearsApi module Queue class JobsService diff --git a/gears/carto_gears_api/lib/carto_gears_api/users/user.rb b/gears/carto_gears_api/lib/carto_gears_api/users/user.rb index 699f83f525..522816cfbe 100644 --- a/gears/carto_gears_api/lib/carto_gears_api/users/user.rb +++ b/gears/carto_gears_api/lib/carto_gears_api/users/user.rb @@ -1,5 +1,4 @@ require 'values' -require_dependency 'carto_gears_api/organizations/organization' module CartoGearsApi module Users diff --git a/gears/carto_gears_api/lib/carto_gears_api/users/users_service.rb b/gears/carto_gears_api/lib/carto_gears_api/users/users_service.rb index 6d51bc3c3c..af93b67ec7 100644 --- a/gears/carto_gears_api/lib/carto_gears_api/users/users_service.rb +++ b/gears/carto_gears_api/lib/carto_gears_api/users/users_service.rb @@ -1,6 +1,3 @@ -require_dependency 'carto_gears_api/users/user' -require_dependency 'carto_gears_api/errors' - module CartoGearsApi module Users class UsersService