about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-03-05 13:12:24 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-03-05 13:12:24 +0100
commit7e93da3f8d31041034ba4eece5ee7a2cec5cfd2b (patch)
tree7d84ab71fd25ed4413520f16041ffd45721dee31 /app
parent3b4e04dc32eba0f5b1ac11e2db2edd7ca7351291 (diff)
Removing grape and adding devise
Diffstat (limited to 'app')
-rw-r--r--app/helpers/routing_helper.rb1
-rw-r--r--app/models/user.rb3
2 files changed, 3 insertions, 1 deletions
diff --git a/app/helpers/routing_helper.rb b/app/helpers/routing_helper.rb
index 390602623..cd8132f07 100644
--- a/app/helpers/routing_helper.rb
+++ b/app/helpers/routing_helper.rb
@@ -1,7 +1,6 @@
 module RoutingHelper
   extend ActiveSupport::Concern
   include Rails.application.routes.url_helpers
-  include GrapeRouteHelpers::NamedRouteMatcher
   include ActionView::Helpers::AssetUrlHelper
 
   included do
diff --git a/app/models/user.rb b/app/models/user.rb
index d871a760a..999aa0d39 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,4 +1,7 @@
 class User < ActiveRecord::Base
+  devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable
+
   belongs_to :account, inverse_of: :user
+
   validates :account, presence: true
 end