Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
f72a5d11
Commit
f72a5d11
authored
Apr 24, 2012
by
Valeriy Sizov
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #732 from mmozuras/ldap_name_utf8
Force utf-8 encoding for ldap omniauth_info.name
parents
2746be6c
03cc55db
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
app/models/user.rb
app/models/user.rb
+7
-7
No files found.
app/models/user.rb
View file @
f72a5d11
...
@@ -13,7 +13,7 @@ class User < ActiveRecord::Base
...
@@ -13,7 +13,7 @@ class User < ActiveRecord::Base
has_many
:my_own_projects
,
:class_name
=>
"Project"
,
:foreign_key
=>
:owner_id
has_many
:my_own_projects
,
:class_name
=>
"Project"
,
:foreign_key
=>
:owner_id
has_many
:keys
,
:dependent
=>
:destroy
has_many
:keys
,
:dependent
=>
:destroy
has_many
:recent_events
,
has_many
:recent_events
,
:class_name
=>
"Event"
,
:class_name
=>
"Event"
,
:foreign_key
=>
:author_id
,
:foreign_key
=>
:author_id
,
:order
=>
"id DESC"
:order
=>
"id DESC"
...
@@ -43,7 +43,7 @@ class User < ActiveRecord::Base
...
@@ -43,7 +43,7 @@ class User < ActiveRecord::Base
validates
:projects_limit
,
validates
:projects_limit
,
:presence
=>
true
,
:presence
=>
true
,
:numericality
=>
{
:greater_than_or_equal_to
=>
0
}
:numericality
=>
{
:greater_than_or_equal_to
=>
0
}
validates
:bio
,
:length
=>
{
:within
=>
0
..
255
}
validates
:bio
,
:length
=>
{
:within
=>
0
..
255
}
before_create
:ensure_authentication_token
before_create
:ensure_authentication_token
...
@@ -93,14 +93,14 @@ class User < ActiveRecord::Base
...
@@ -93,14 +93,14 @@ class User < ActiveRecord::Base
(
0
...
8
).
map
{
(
'a'
..
'z'
).
to_a
[
rand
(
26
)]
}.
join
(
0
...
8
).
map
{
(
'a'
..
'z'
).
to_a
[
rand
(
26
)]
}.
join
end
end
def
first_name
def
first_name
name
.
split
(
" "
).
first
unless
name
.
blank?
name
.
split
(
" "
).
first
unless
name
.
blank?
end
end
def
self
.
find_for_ldap_auth
(
omniauth_info
)
def
self
.
find_for_ldap_auth
(
omniauth_info
)
name
=
omniauth_info
.
name
name
=
omniauth_info
.
name
.
force_encoding
(
"utf-8"
)
email
=
omniauth_info
.
email
.
downcase
email
=
omniauth_info
.
email
.
downcase
if
@user
=
User
.
find_by_email
(
email
)
if
@user
=
User
.
find_by_email
(
email
)
@user
@user
else
else
...
@@ -123,8 +123,8 @@ class User < ActiveRecord::Base
...
@@ -123,8 +123,8 @@ class User < ActiveRecord::Base
# Remove user from all projects and
# Remove user from all projects and
# set blocked attribute to true
# set blocked attribute to true
def
block
def
block
users_projects
.
all
.
each
do
|
membership
|
users_projects
.
all
.
each
do
|
membership
|
return
false
unless
membership
.
destroy
return
false
unless
membership
.
destroy
end
end
...
...
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