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
Léo-Paul Géneau
gitlab-ce
Commits
e3d48eb1
Commit
e3d48eb1
authored
Sep 05, 2018
by
Martin Wortschack
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove trailing whitespaces
parent
02b86d39
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
3 deletions
+1
-3
app/views/admin/application_settings/integrations.html.haml
app/views/admin/application_settings/integrations.html.haml
+0
-1
qa/qa/page/admin/settings/main.rb
qa/qa/page/admin/settings/main.rb
+0
-1
spec/features/admin/admin_settings_spec.rb
spec/features/admin/admin_settings_spec.rb
+1
-1
No files found.
app/views/admin/application_settings/integrations.html.haml
View file @
e3d48eb1
...
@@ -28,4 +28,3 @@
...
@@ -28,4 +28,3 @@
=
_
(
'Control the display of third party offers.'
)
=
_
(
'Control the display of third party offers.'
)
.settings-content
.settings-content
=
render
'third_party_offers'
,
application_setting:
@application_setting
=
render
'third_party_offers'
,
application_setting:
@application_setting
qa/qa/page/admin/settings/main.rb
View file @
e3d48eb1
...
@@ -10,7 +10,6 @@ module QA
...
@@ -10,7 +10,6 @@ module QA
end
end
def
expand_repository_storage
(
&
block
)
def
expand_repository_storage
(
&
block
)
expand_section
(
:terms_settings
)
do
expand_section
(
:terms_settings
)
do
RepositoryStorage
.
perform
(
&
block
)
RepositoryStorage
.
perform
(
&
block
)
end
end
...
...
spec/features/admin/admin_settings_spec.rb
View file @
e3d48eb1
...
@@ -301,7 +301,7 @@ describe 'Admin updates settings' do
...
@@ -301,7 +301,7 @@ describe 'Admin updates settings' do
it
'Configure web terminal'
do
it
'Configure web terminal'
do
visit
admin_application_settings_path
visit
admin_application_settings_path
page
.
within
(
'.as-terminal'
)
do
page
.
within
(
'.as-terminal'
)
do
fill_in
'Max session time'
,
with:
15
fill_in
'Max session time'
,
with:
15
click_button
'Save changes'
click_button
'Save changes'
...
...
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