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
Boxiang Sun
gitlab-ce
Commits
260c88a7
Commit
260c88a7
authored
May 12, 2016
by
Andrei Gliga
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no need to define the help block since there's no help block
parent
6cdce049
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
app/helpers/application_settings_helper.rb
app/helpers/application_settings_helper.rb
+2
-3
app/views/admin/application_settings/_form.html.haml
app/views/admin/application_settings/_form.html.haml
+1
-1
No files found.
app/helpers/application_settings_helper.rb
View file @
260c88a7
...
@@ -61,7 +61,7 @@ module ApplicationSettingsHelper
...
@@ -61,7 +61,7 @@ module ApplicationSettingsHelper
end
end
end
end
def
oauth_providers_checkboxes
(
help_block_id
)
def
oauth_providers_checkboxes
button_based_providers
.
map
do
|
source
|
button_based_providers
.
map
do
|
source
|
disabled
=
current_application_settings
.
disabled_oauth_sign_in_sources
.
include?
(
source
.
to_s
)
disabled
=
current_application_settings
.
disabled_oauth_sign_in_sources
.
include?
(
source
.
to_s
)
css_class
=
'btn'
css_class
=
'btn'
...
@@ -70,8 +70,7 @@ module ApplicationSettingsHelper
...
@@ -70,8 +70,7 @@ module ApplicationSettingsHelper
label_tag
(
checkbox_name
,
class:
css_class
)
do
label_tag
(
checkbox_name
,
class:
css_class
)
do
check_box_tag
(
checkbox_name
,
source
,
!
disabled
,
check_box_tag
(
checkbox_name
,
source
,
!
disabled
,
autocomplete:
'off'
,
autocomplete:
'off'
)
+
Gitlab
::
OAuth
::
Provider
.
label_for
(
source
)
'aria-describedby'
=>
help_block_id
)
+
Gitlab
::
OAuth
::
Provider
.
label_for
(
source
)
end
end
end
end
end
end
...
...
app/views/admin/application_settings/_form.html.haml
View file @
260c88a7
...
@@ -114,7 +114,7 @@
...
@@ -114,7 +114,7 @@
=
f
.
label
:enabled_oauth_sign_in_sources
,
'Enabled OAuth Sign-In sources'
,
class:
'control-label col-sm-2'
=
f
.
label
:enabled_oauth_sign_in_sources
,
'Enabled OAuth Sign-In sources'
,
class:
'control-label col-sm-2'
.col-sm-10
.col-sm-10
.btn-group
{
data:
{
toggle:
'buttons'
}
}
.btn-group
{
data:
{
toggle:
'buttons'
}
}
-
oauth_providers_checkboxes
(
'oauth-providers-help'
)
.
each
do
|
source
|
-
oauth_providers_checkboxes
.
each
do
|
source
|
=
source
=
source
.form-group
.form-group
=
f
.
label
:two_factor_authentication
,
'Two-factor authentication'
,
class:
'control-label col-sm-2'
=
f
.
label
:two_factor_authentication
,
'Two-factor authentication'
,
class:
'control-label col-sm-2'
...
...
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