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
Léo-Paul Géneau
gitlab-ce
Commits
1e8ed9d5
Commit
1e8ed9d5
authored
Apr 08, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
parents
7f148385
7f2551ac
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
4 deletions
+17
-4
CHANGELOG
CHANGELOG
+1
-0
app/views/devise/sessions/new.html.haml
app/views/devise/sessions/new.html.haml
+10
-3
config/gitlab.yml.example
config/gitlab.yml.example
+5
-1
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+1
-0
No files found.
CHANGELOG
View file @
1e8ed9d5
...
...
@@ -12,6 +12,7 @@ v 6.8.0
- Disable connection reaping for MySQL
- Allow oauth signup without email for twitter and github
- Fix faulty namespace names that caused 500 on user creation
- Option to disable standard login
v 6.7.3
- Fix the merge notification email not being sent (Pierre de La Morinerie)
...
...
app/views/devise/sessions/new.html.haml
View file @
1e8ed9d5
.login-box
%h3
.page-title
Sign in
-
if
ldap_enabled?
-
if
ldap_enabled?
&&
gitlab_config
.
signin_enabled
%ul
.nav.nav-tabs
%li
.active
=
link_to
'LDAP'
,
'#tab-ldap'
,
'data-toggle'
=>
'tab'
...
...
@@ -12,11 +12,18 @@
%div
#tab-signin
.tab-pane
=
render
partial:
'devise/sessions/new_base'
-
else
-
elsif
ldap_enabled?
=
render
partial:
'devise/sessions/new_ldap'
-
elsif
gitlab_config
.
signin_enabled
=
render
partial:
'devise/sessions/new_base'
-
else
%div
No authentication methods configured.
=
render
'devise/sessions/oauth_providers'
if
devise_mapping
.
omniauthable?
=
render
'devise/sessions/oauth_providers'
if
Gitlab
.
config
.
omniauth
.
enabled
&&
devise_mapping
.
omniauthable?
%hr
-
if
gitlab_config
.
signup_enabled
...
...
config/gitlab.yml.example
View file @
1e8ed9d5
...
...
@@ -54,8 +54,12 @@ production: &base
## Users management
# default: false - Account passwords are not sent via the email if signup is enabled.
# default: false - Account passwords are not sent via the email if signup is enabled.
# signup_enabled: true
#
# default: true - If set to false, standard login form won't be shown on the sign-in page
# signin_enabled: false
# Restrict setting visibility levels for non-admin users.
# The default is to allow all levels.
...
...
config/initializers/1_settings.rb
View file @
1e8ed9d5
...
...
@@ -87,6 +87,7 @@ rescue ArgumentError # no user configured
'/home/'
+
Settings
.
gitlab
[
'user'
]
end
Settings
.
gitlab
[
'signup_enabled'
]
||=
false
Settings
.
gitlab
[
'signin_enabled'
]
||=
true
if
Settings
.
gitlab
[
'signin_enabled'
].
nil?
Settings
.
gitlab
[
'restricted_visibility_levels'
]
=
Settings
.
send
(
:verify_constant_array
,
Gitlab
::
VisibilityLevel
,
Settings
.
gitlab
[
'restricted_visibility_levels'
],
[])
Settings
.
gitlab
[
'username_changing_enabled'
]
=
true
if
Settings
.
gitlab
[
'username_changing_enabled'
].
nil?
Settings
.
gitlab
[
'issue_closing_pattern'
]
=
'([Cc]loses|[Ff]ixes) #(\d+)'
if
Settings
.
gitlab
[
'issue_closing_pattern'
].
nil?
...
...
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