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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
763e14c3
Commit
763e14c3
authored
Apr 11, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[skip ci] Replace .radio with .form-check
parent
df8aa61a
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
12 additions
and
12 deletions
+12
-12
app/assets/javascripts/project_visibility.js
app/assets/javascripts/project_visibility.js
+1
-1
app/views/admin/application_settings/_signup.html.haml
app/views/admin/application_settings/_signup.html.haml
+2
-2
app/views/projects/_merge_request_fast_forward_settings.html.haml
...s/projects/_merge_request_fast_forward_settings.html.haml
+1
-1
app/views/projects/_merge_request_rebase_settings.html.haml
app/views/projects/_merge_request_rebase_settings.html.haml
+1
-1
app/views/projects/_merge_request_settings.html.haml
app/views/projects/_merge_request_settings.html.haml
+1
-1
app/views/projects/settings/ci_cd/_form.html.haml
app/views/projects/settings/ci_cd/_form.html.haml
+5
-5
app/views/shared/_visibility_radios.html.haml
app/views/shared/_visibility_radios.html.haml
+1
-1
No files found.
app/assets/javascripts/project_visibility.js
View file @
763e14c3
...
...
@@ -7,7 +7,7 @@ function setVisibilityOptions(namespaceSelector) {
const
selectedNamespace
=
namespaceSelector
.
options
[
namespaceSelector
.
selectedIndex
];
const
{
name
,
visibility
,
visibilityLevel
,
showPath
,
editPath
}
=
selectedNamespace
.
dataset
;
document
.
querySelectorAll
(
'
.visibility-level-setting .
radio
'
).
forEach
((
option
)
=>
{
document
.
querySelectorAll
(
'
.visibility-level-setting .
form-check
'
).
forEach
((
option
)
=>
{
const
optionInput
=
option
.
querySelector
(
'
input[type=radio]
'
);
const
optionValue
=
optionInput
?
optionInput
.
value
:
0
;
const
optionTitle
=
option
.
querySelector
(
'
.option-title
'
);
...
...
app/views/admin/application_settings/_signup.html.haml
View file @
763e14c3
...
...
@@ -28,12 +28,12 @@
Enable domain blacklist for sign ups
.form-group
.col-sm-offset-2.col-sm-10
.
radio
.
form-check
=
label_tag
:blacklist_type_file
do
=
radio_button_tag
:blacklist_type
,
:file
.option-title
Upload blacklist file
.
radio
.
form-check
=
label_tag
:blacklist_type_raw
do
=
radio_button_tag
:blacklist_type
,
:raw
,
@application_setting
.
domain_blacklist
.
present?
||
@application_setting
.
domain_blacklist
.
blank?
.option-title
...
...
app/views/projects/_merge_request_fast_forward_settings.html.haml
View file @
763e14c3
-
form
=
local_assigns
.
fetch
(
:form
)
-
project
=
local_assigns
.
fetch
(
:project
)
.
radio
.
form-check
=
label_tag
:project_merge_method_ff
do
=
form
.
radio_button
:merge_method
,
:ff
,
class:
"js-merge-method-radio qa-radio-button-merge-ff"
%strong
Fast-forward merge
...
...
app/views/projects/_merge_request_rebase_settings.html.haml
View file @
763e14c3
-
form
=
local_assigns
.
fetch
(
:form
)
.
radio
.
form-check
=
label_tag
:project_merge_method_rebase_merge
do
=
form
.
radio_button
:merge_method
,
:rebase_merge
,
class:
"js-merge-method-radio"
%strong
Merge commit with semi-linear history
...
...
app/views/projects/_merge_request_settings.html.haml
View file @
763e14c3
...
...
@@ -3,7 +3,7 @@
.form-group
=
label_tag
:merge_method_merge
,
class:
'label-light'
do
Merge method
.
radio
.
form-check
=
label_tag
:project_merge_method_merge
do
=
form
.
radio_button
:merge_method
,
:merge
,
class:
"js-merge-method-radio"
%strong
Merge commit
...
...
app/views/projects/settings/ci_cd/_form.html.haml
View file @
763e14c3
...
...
@@ -13,7 +13,7 @@
%p
.settings-message.text-center
=
message
.
html_safe
=
f
.
fields_for
:auto_devops_attributes
,
@auto_devops
do
|
form
|
.
radio
.
form-check
=
form
.
label
:enabled_true
do
=
form
.
radio_button
:enabled
,
'true'
%strong
Enable Auto DevOps
...
...
@@ -21,7 +21,7 @@
%span
.descr
The Auto DevOps pipeline configuration will be used when there is no
<code>
.gitlab-ci.yml
</code>
in the project.
.
radio
.
form-check
=
form
.
label
:enabled_false
do
=
form
.
radio_button
:enabled
,
'false'
%strong
Disable Auto DevOps
...
...
@@ -29,7 +29,7 @@
%span
.descr
An explicit
<code>
.gitlab-ci.yml
</code>
needs to be specified before you can begin using Continuous Integration and Delivery.
.
radio
.
form-check
=
form
.
label
:enabled_
do
=
form
.
radio_button
:enabled
,
''
%strong
Instance default (
#{
Gitlab
::
CurrentSettings
.
auto_devops_enabled?
?
'enabled'
:
'disabled'
}
)
...
...
@@ -57,14 +57,14 @@
%p
Choose between
<code>
clone
</code>
or
<code>
fetch
</code>
to get the recent application code
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'user/project/pipelines/settings'
,
anchor:
'git-strategy'
),
target:
'_blank'
.
radio
.
form-check
=
f
.
label
:build_allow_git_fetch_false
do
=
f
.
radio_button
:build_allow_git_fetch
,
'false'
%strong
git clone
%br
%span
.descr
Slower but makes sure the project workspace is pristine as it clones the repository from scratch for every job
.
radio
.
form-check
=
f
.
label
:build_allow_git_fetch_true
do
=
f
.
radio_button
:build_allow_git_fetch
,
'true'
%strong
git fetch
...
...
app/views/shared/_visibility_radios.html.haml
View file @
763e14c3
...
...
@@ -2,7 +2,7 @@
-
disallowed
=
disallowed_visibility_level?
(
form_model
,
level
)
-
restricted
=
restricted_visibility_levels
.
include?
(
level
)
-
disabled
=
disallowed
||
restricted
.
radio
{
class:
[(
'disabled'
if
disabled
),
(
'restricted'
if
restricted
)]
}
.
form-check
{
class:
[(
'disabled'
if
disabled
),
(
'restricted'
if
restricted
)]
}
=
form
.
label
"
#{
model_method
}
_
#{
level
}
"
do
=
form
.
radio_button
model_method
,
level
,
checked:
(
selected_level
==
level
),
disabled:
disabled
=
visibility_level_icon
(
level
)
...
...
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