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
2e63c8b6
Commit
2e63c8b6
authored
Feb 28, 2018
by
Constance Okoghenun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added conditional loading of protected tag bundles
parent
1c03aace
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
6 deletions
+14
-6
app/views/projects/settings/repository/show.html.haml
app/views/projects/settings/repository/show.html.haml
+3
-2
ee/app/assets/javascripts/pages/projects/settings/repository/show/index.js
...ascripts/pages/projects/settings/repository/show/index.js
+11
-4
No files found.
app/views/projects/settings/repository/show.html.haml
View file @
2e63c8b6
...
...
@@ -13,6 +13,7 @@
-# Those are used throughout the actual views. These `shared` views are then
-# reused in EE.
-
if
@project
.
feature_available?
(
:protected_refs_for_users
,
current_user
)
.js-protected-refs-for-users
=
render
"projects/protected_branches/ee/index"
=
render
"projects/protected_tags/ee/index"
-
else
...
...
ee/app/assets/javascripts/pages/projects/settings/repository/show/index.js
View file @
2e63c8b6
...
...
@@ -3,14 +3,21 @@ import UsersSelect from '~/users_select';
import
UserCallout
from
'
~/user_callout
'
;
import
initSettingsPanels
from
'
~/settings_panels
'
;
import
initDeployKeys
from
'
~/deploy_keys
'
;
import
ProtectedTagCreate
from
'
ee/protected_tags/protected_tag_create
'
;
import
ProtectedTagEditList
from
'
ee/protected_tags/protected_tag_edit_list
'
;
import
ProtectedTagCreateEE
from
'
ee/protected_tags/protected_tag_create
'
;
import
ProtectedTagEditListEE
from
'
ee/protected_tags/protected_tag_edit_list
'
;
import
ProtectedTagCreateCE
from
'
~/protected_tags/protected_tag_create
'
;
import
ProtectedTagEditListCE
from
'
~/protected_tags/protected_tag_edit_list
'
;
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
new
UsersSelect
();
new
UserCallout
();
new
ProtectedTagCreate
();
new
ProtectedTagEditList
();
if
(
document
.
querySelector
(
'
.js-protected-refs-for-users
'
))
{
new
ProtectedTagCreateEE
();
new
ProtectedTagEditListEE
();
}
else
{
new
ProtectedTagCreateCE
();
new
ProtectedTagEditListCE
();
}
initDeployKeys
();
initSettingsPanels
();
});
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