Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
R
rendezvous
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
VeNtura
rendezvous
Commits
bd6ebbab
Commit
bd6ebbab
authored
Apr 01, 2014
by
tady
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
set default nickname
parent
36905501
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
app/models/user.rb
+3
-1
config/routes.rb
+1
-1
No files found.
app/models/user.rb
View file @
bd6ebbab
...
@@ -41,10 +41,12 @@ class User < ActiveRecord::Base
...
@@ -41,10 +41,12 @@ class User < ActiveRecord::Base
user
=
User
.
where
(
email:
info
[
'email'
]).
first
user
=
User
.
where
(
email:
info
[
'email'
]).
first
unless
user
unless
user
new_nickname
=
((
"a"
..
"z"
).
to_a
+
(
"A"
..
"Z"
).
to_a
+
(
0
..
9
).
to_a
).
shuffle
[
0
..
4
].
join
user
=
User
.
create
(
name:
info
[
'name'
],
user
=
User
.
create
(
name:
info
[
'name'
],
image_url:
info
[
'image'
],
image_url:
info
[
'image'
],
email:
info
[
'email'
],
email:
info
[
'email'
],
password:
Devise
.
friendly_token
[
0
,
20
]
password:
Devise
.
friendly_token
[
0
,
20
],
nickname:
new_nickname
)
)
end
end
...
...
config/routes.rb
View file @
bd6ebbab
...
@@ -25,7 +25,7 @@ Rendezvous::Application.routes.draw do
...
@@ -25,7 +25,7 @@ Rendezvous::Application.routes.draw do
# devise_for :users , controllers: { omniauth_callbacks: 'users/omniauth_callbacks' }
# devise_for :users , controllers: { omniauth_callbacks: 'users/omniauth_callbacks' }
# devise_for :users , only: [:sign_in, :sign_out, :session]
# devise_for :users , only: [:sign_in, :sign_out, :session]
devise_for
:users
,
controllers:
{
omniauth_callbacks:
"users/omniauth_callbacks"
},
skip:
[
:sessions
]
devise_for
:users
,
controllers:
{
omniauth_callbacks:
'users/omniauth_callbacks'
},
skip:
[
:sessions
]
devise_scope
:user
do
devise_scope
:user
do
# get 'sign_in', to: 'users/sessions#new', as: :new_user_session
# get 'sign_in', to: 'users/sessions#new', as: :new_user_session
delete
'sign_out'
,
to:
'devise/sessions#destroy'
,
as: :sign_out
delete
'sign_out'
,
to:
'devise/sessions#destroy'
,
as: :sign_out
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment