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
533d53bf
Commit
533d53bf
authored
Jul 26, 2019
by
Tanya Pazitny
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change qa-* class references to rspec-*
parent
2219b140
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/views/projects/edit.html.haml
app/views/projects/edit.html.haml
+1
-1
spec/features/projects_spec.rb
spec/features/projects_spec.rb
+1
-1
No files found.
app/views/projects/edit.html.haml
View file @
533d53bf
...
...
@@ -23,7 +23,7 @@
.js-project-permissions-form
=
f
.
submit
_
(
'Save changes'
),
class:
"btn btn-success"
%section
.qa-merge-request-settings.settings.merge-requests-feature.no-animate
#js-merge-request-settings
{
class:
[(
'expanded'
if
expanded
),
(
'hidden'
if
@project
.
project_feature
.
send
(
:merge_requests_access_level
)
==
0
)]
}
%section
.qa-merge-request-settings.
rspec-merge-request-settings.
settings.merge-requests-feature.no-animate
#js-merge-request-settings
{
class:
[(
'expanded'
if
expanded
),
(
'hidden'
if
@project
.
project_feature
.
send
(
:merge_requests_access_level
)
==
0
)]
}
.settings-header
%h4
.settings-title.js-settings-toggle.js-settings-toggle-trigger-only
=
_
(
'Merge requests'
)
%button
.btn.btn-default.js-settings-toggle
{
type:
'button'
}=
expanded
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
...
...
spec/features/projects_spec.rb
View file @
533d53bf
...
...
@@ -387,7 +387,7 @@ describe 'Project' do
end
it_behaves_like
'dirty submit form'
,
[{
form:
'.js-general-settings-form'
,
input:
'input[name="project[name]"]'
},
{
form:
'.
qa
-merge-request-settings'
,
input:
'#project_printing_merge_request_link_enabled'
}]
{
form:
'.
rspec
-merge-request-settings'
,
input:
'#project_printing_merge_request_link_enabled'
}]
end
def
remove_with_confirm
(
button_text
,
confirm_with
)
...
...
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