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
8cf1a6f0
Commit
8cf1a6f0
authored
9 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
parents
f57dac27
6e88d933
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
2 deletions
+12
-2
CHANGELOG
CHANGELOG
+2
-0
app/controllers/admin/users_controller.rb
app/controllers/admin/users_controller.rb
+1
-1
config/initializers/5_backend.rb
config/initializers/5_backend.rb
+7
-0
lib/gitlab/backend/shell.rb
lib/gitlab/backend/shell.rb
+1
-1
lib/gitlab/ldap/user.rb
lib/gitlab/ldap/user.rb
+1
-0
No files found.
CHANGELOG
View file @
8cf1a6f0
...
@@ -78,6 +78,8 @@ v 7.9.3
...
@@ -78,6 +78,8 @@ v 7.9.3
- Contains no changes
- Contains no changes
- Add icons to Add dropdown items.
- Add icons to Add dropdown items.
- Allow admin to create public deploy keys that are accessible to any project.
- Allow admin to create public deploy keys that are accessible to any project.
- Warn when gitlab-shell version doesn't match requirement.
- Skip email confirmation when set by admin or via LDAP.
v 7.9.2
v 7.9.2
...
...
This diff is collapsed.
Click to expand it.
app/controllers/admin/users_controller.rb
View file @
8cf1a6f0
...
@@ -72,8 +72,8 @@ class Admin::UsersController < Admin::ApplicationController
...
@@ -72,8 +72,8 @@ class Admin::UsersController < Admin::ApplicationController
end
end
respond_to
do
|
format
|
respond_to
do
|
format
|
user
.
skip_reconfirmation!
if
user
.
update_attributes
(
user_params_with_pass
)
if
user
.
update_attributes
(
user_params_with_pass
)
user
.
confirm!
format
.
html
{
redirect_to
[
:admin
,
user
],
notice:
'User was successfully updated.'
}
format
.
html
{
redirect_to
[
:admin
,
user
],
notice:
'User was successfully updated.'
}
format
.
json
{
head
:ok
}
format
.
json
{
head
:ok
}
else
else
...
...
This diff is collapsed.
Click to expand it.
config/initializers/5_backend.rb
View file @
8cf1a6f0
...
@@ -6,3 +6,10 @@ require Rails.root.join("lib", "gitlab", "backend", "shell")
...
@@ -6,3 +6,10 @@ require Rails.root.join("lib", "gitlab", "backend", "shell")
# GitLab shell adapter
# GitLab shell adapter
require
Rails
.
root
.
join
(
"lib"
,
"gitlab"
,
"backend"
,
"shell_adapter"
)
require
Rails
.
root
.
join
(
"lib"
,
"gitlab"
,
"backend"
,
"shell_adapter"
)
required_version
=
Gitlab
::
VersionInfo
.
parse
(
Gitlab
::
Shell
.
version_required
)
current_version
=
Gitlab
::
VersionInfo
.
parse
(
Gitlab
::
Shell
.
new
.
version
)
unless
current_version
.
valid?
&&
required_version
<=
current_version
warn
"WARNING: This version of GitLab depends on gitlab-shell
#{
required_version
}
, but you're running
#{
current_version
}
. Please update gitlab-shell."
end
This diff is collapsed.
Click to expand it.
lib/gitlab/backend/shell.rb
View file @
8cf1a6f0
...
@@ -240,7 +240,7 @@ module Gitlab
...
@@ -240,7 +240,7 @@ module Gitlab
gitlab_shell_version_file
=
"
#{
gitlab_shell_path
}
/VERSION"
gitlab_shell_version_file
=
"
#{
gitlab_shell_path
}
/VERSION"
if
File
.
readable?
(
gitlab_shell_version_file
)
if
File
.
readable?
(
gitlab_shell_version_file
)
File
.
read
(
gitlab_shell_version_file
)
File
.
read
(
gitlab_shell_version_file
)
.
chomp
end
end
end
end
...
...
This diff is collapsed.
Click to expand it.
lib/gitlab/ldap/user.rb
View file @
8cf1a6f0
...
@@ -39,6 +39,7 @@ module Gitlab
...
@@ -39,6 +39,7 @@ module Gitlab
end
end
def
update_user_attributes
def
update_user_attributes
gl_user
.
skip_reconfirmation!
gl_user
.
email
=
auth_hash
.
email
gl_user
.
email
=
auth_hash
.
email
# Build new identity only if we dont have have same one
# Build new identity only if we dont have have same one
...
...
This diff is collapsed.
Click to expand it.
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