Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
1be00e9d5db4
Commit
e2da9727
authored
Aug 28, 2019
by
Arun Kumar Mohan
Browse files
Remove unnecessary CSS class
parent
786b1546ddcf
Changes
6
Hide whitespace changes
Inline
Side-by-side
app/views/groups/_group_admin_settings.html.haml
View file @
1be00e9d
...
...
@@ -9,7 +9,7 @@
Allow projects within this group to use Git LFS
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'workflow/lfs/manage_large_binaries_with_git_lfs'
)
%br
/
%span
.descr
This setting can be overridden in each project.
%span
This setting can be overridden in each project.
.form-group.row
.col-sm-2.col-form-label
=
f
.
label
s_
(
'ProjectCreationLevel|Allowed to create projects'
)
...
...
app/views/groups/settings/_permissions.html.haml
View file @
1be00e9d
...
...
@@ -14,7 +14,7 @@
%span
.d-block
-
group_link
=
link_to
@group
.
name
,
group_path
(
@group
)
=
s_
(
'GroupSettings|Prevent sharing a project within %{group} with other groups'
).
html_safe
%
{
group:
group_link
}
%span
.descr.text-muted
=
share_with_group_lock_help_text
(
@group
)
%span
.
js-
descr.text-muted
=
share_with_group_lock_help_text
(
@group
)
.form-group.append-bottom-default
.form-check
...
...
app/views/projects/_merge_request_merge_checks_settings.html.haml
View file @
1be00e9d
...
...
@@ -7,7 +7,7 @@
=
form
.
check_box
:only_allow_merge_if_pipeline_succeeds
,
class:
'form-check-input'
=
form
.
label
:only_allow_merge_if_pipeline_succeeds
,
class:
'form-check-label'
do
=
s_
(
'ProjectSettings|Pipelines must succeed'
)
.descr
.text-secondary
.text-secondary
=
s_
(
'ProjectSettings|Pipelines need to be configured to enable this feature.'
)
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'ci/merge_request_pipelines/index.md'
,
...
...
app/views/projects/_merge_request_merge_method_settings.html.haml
View file @
1be00e9d
...
...
@@ -7,14 +7,14 @@
=
form
.
radio_button
:merge_method
,
:merge
,
class:
"js-merge-method-radio form-check-input"
=
label_tag
:project_merge_method_merge
,
class:
'form-check-label'
do
=
s_
(
'ProjectSettings|Merge commit'
)
.descr
.text-secondary
.text-secondary
=
s_
(
'ProjectSettings|Every merge creates a merge commit'
)
.form-check.mb-2
=
form
.
radio_button
:merge_method
,
:rebase_merge
,
class:
"js-merge-method-radio form-check-input"
=
label_tag
:project_merge_method_rebase_merge
,
class:
'form-check-label'
do
=
s_
(
'ProjectSettings|Merge commit with semi-linear history'
)
.descr
.text-secondary
.text-secondary
=
s_
(
'ProjectSettings|Every merge creates a merge commit'
)
%br
=
s_
(
'ProjectSettings|Fast-forward merges only'
)
...
...
@@ -25,7 +25,7 @@
=
form
.
radio_button
:merge_method
,
:ff
,
class:
"js-merge-method-radio qa-radio-button-merge-ff form-check-input"
=
label_tag
:project_merge_method_ff
,
class:
'form-check-label'
do
=
s_
(
'ProjectSettings|Fast-forward merge'
)
.descr
.text-secondary
.text-secondary
=
s_
(
'ProjectSettings|No merge commits are created'
)
%br
=
s_
(
'ProjectSettings|Fast-forward merges only'
)
...
...
app/views/projects/settings/ci_cd/_form.html.haml
View file @
1be00e9d
...
...
@@ -14,14 +14,14 @@
=
f
.
label
:build_allow_git_fetch_false
,
class:
'form-check-label'
do
%strong
git clone
%br
%span
.descr
%span
=
_
(
"Slower but makes sure the project workspace is pristine as it clones the repository from scratch for every job"
)
.form-check
=
f
.
radio_button
:build_allow_git_fetch
,
'true'
,
{
class:
'form-check-input'
}
=
f
.
label
:build_allow_git_fetch_true
,
class:
'form-check-label'
do
%strong
git fetch
%br
%span
.descr
%span
=
_
(
"Faster as it re-uses the project workspace (falling back to clone if it doesn't exist)"
)
%hr
...
...
spec/views/groups/edit.html.haml_spec.rb
View file @
1be00e9d
...
...
@@ -23,7 +23,7 @@
render
expect
(
rendered
).
to
have_content
(
"Prevent sharing a project within
#{
test_group
.
name
}
with other groups"
)
expect
(
rendered
).
to
have_css
(
'.descr'
,
text:
'help text here'
)
expect
(
rendered
).
to
have_css
(
'.
js-
descr'
,
text:
'help text here'
)
expect
(
rendered
).
to
have_field
(
'group_share_with_group_lock'
,
checkbox_options
)
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