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
7a162e1a
Commit
7a162e1a
authored
Aug 27, 2019
by
Sanad Liaquat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CE Backport of EE changes
Add qa selector elements and files from the EE branch
parent
4d4e88df
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
26 additions
and
4 deletions
+26
-4
app/views/groups/edit.html.haml
app/views/groups/edit.html.haml
+1
-1
app/views/groups/settings/_permissions.html.haml
app/views/groups/settings/_permissions.html.haml
+1
-1
app/views/layouts/nav/sidebar/_group.html.haml
app/views/layouts/nav/sidebar/_group.html.haml
+1
-1
qa/qa.rb
qa/qa.rb
+4
-0
qa/qa/page/group/settings/general.rb
qa/qa/page/group/settings/general.rb
+18
-0
qa/qa/resource/sandbox.rb
qa/qa/resource/sandbox.rb
+1
-1
No files found.
app/views/groups/edit.html.haml
View file @
7a162e1a
...
...
@@ -14,7 +14,7 @@
.settings-content
=
render
'groups/settings/general'
%section
.settings.gs-permissions.no-animate
#js-permissions-settings
{
class:
(
'expanded'
if
expanded
)
}
%section
.settings.gs-permissions.no-animate
#js-permissions-settings
{
class:
(
'expanded'
if
expanded
)
,
data:
{
qa_selector:
'permission_lfs_2fa_section'
}
}
.settings-header
%h4
.settings-title.js-settings-toggle.js-settings-toggle-trigger-only
{
role:
'button'
}
=
_
(
'Permissions, LFS, 2FA'
)
...
...
app/views/groups/settings/_permissions.html.haml
View file @
7a162e1a
...
...
@@ -31,4 +31,4 @@
=
render
'groups/settings/two_factor_auth'
,
f:
f
=
render_if_exists
'groups/member_lock_setting'
,
f:
f
,
group:
@group
=
f
.
submit
_
(
'Save changes'
),
class:
'btn btn-success prepend-top-default js-dirty-submit'
=
f
.
submit
_
(
'Save changes'
),
class:
'btn btn-success prepend-top-default js-dirty-submit'
,
data:
{
qa_selector:
'save_permissions_changes_button'
}
app/views/layouts/nav/sidebar/_group.html.haml
View file @
7a162e1a
...
...
@@ -147,7 +147,7 @@
=
_
(
'Settings'
)
%li
.divider.fly-out-top-item
=
nav_link
(
path:
'groups#edit'
)
do
=
link_to
edit_group_path
(
@group
),
title:
_
(
'General'
)
do
=
link_to
edit_group_path
(
@group
),
title:
_
(
'General'
)
,
data:
{
qa_selector:
'general_settings_link'
}
do
%span
=
_
(
'General'
)
...
...
qa/qa.rb
View file @
7a162e1a
...
...
@@ -160,6 +160,10 @@ module QA
module
Group
autoload
:New
,
'qa/page/group/new'
autoload
:Show
,
'qa/page/group/show'
module
Settings
autoload
:General
,
'qa/page/group/settings/general'
end
end
module
File
...
...
qa/qa/page/group/settings/general.rb
0 → 100644
View file @
7a162e1a
# frozen_string_literal: true
module
QA
module
Page
module
Group
module
Settings
class
General
<
QA
::
Page
::
Base
view
'app/views/groups/edit.html.haml'
do
element
:permission_lfs_2fa_section
end
view
'app/views/groups/settings/_permissions.html.haml'
do
element
:save_permissions_changes_button
end
end
end
end
end
end
qa/qa/resource/sandbox.rb
View file @
7a162e1a
...
...
@@ -7,7 +7,7 @@ module QA
# creating it if it doesn't yet exist.
#
class
Sandbox
<
Base
attr_
reade
r
:path
attr_
accesso
r
:path
attribute
:id
...
...
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