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
ffc23157
Commit
ffc23157
authored
Apr 29, 2021
by
GitLab Bot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add latest changes from gitlab-org/gitlab@13-11-stable-ee
parent
bbdea2d9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
6 deletions
+17
-6
app/assets/javascripts/pages/admin/application_settings/integrations/index.js
...ts/pages/admin/application_settings/integrations/index.js
+6
-4
changelogs/unreleased/fix-admin-integrations-foss.yml
changelogs/unreleased/fix-admin-integrations-foss.yml
+5
-0
lib/gitlab/ci/templates/Jobs/Build.gitlab-ci.yml
lib/gitlab/ci/templates/Jobs/Build.gitlab-ci.yml
+2
-2
spec/features/admin/admin_settings_spec.rb
spec/features/admin/admin_settings_spec.rb
+4
-0
No files found.
app/assets/javascripts/pages/admin/application_settings/integrations/index.js
View file @
ffc23157
import
initIntegrationsList
from
'
~/integrations/index
'
;
import
PersistentUserCallout
from
'
~/persistent_user_callout
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
const
callout
=
document
.
querySelector
(
'
.js-admin-integrations-moved
'
);
PersistentUserCallout
.
factory
(
callout
);
});
const
callout
=
document
.
querySelector
(
'
.js-admin-integrations-moved
'
);
PersistentUserCallout
.
factory
(
callout
);
initIntegrationsList
();
changelogs/unreleased/fix-admin-integrations-foss.yml
0 → 100644
View file @
ffc23157
---
title
:
Fix Instance-level Project Integration Management page for GitLab FOSS
merge_request
:
60354
author
:
type
:
fixed
lib/gitlab/ci/templates/Jobs/Build.gitlab-ci.yml
View file @
ffc23157
build
:
stage
:
build
image
:
"
registry.gitlab.com/gitlab-org/cluster-integration/auto-build-image:v0.
6
.0"
image
:
"
registry.gitlab.com/gitlab-org/cluster-integration/auto-build-image:v0.
4
.0"
variables
:
DOCKER_TLS_CERTDIR
:
"
"
services
:
-
docker:
20.10.6
-dind
-
docker:
19.03.12
-dind
script
:
-
|
if [[ -z "$CI_COMMIT_TAG" ]]; then
...
...
spec/features/admin/admin_settings_spec.rb
View file @
ffc23157
...
...
@@ -305,6 +305,10 @@ RSpec.describe 'Admin updates settings' do
expect
(
page
).
not_to
have_content
(
'Some settings have moved'
)
end
it
'shows integrations table'
do
expect
(
page
).
to
have_selector
'[data-testid="inactive-integrations-table"]'
end
end
context
'CI/CD page'
do
...
...
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