diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2018-01-12 01:32:41 -0600 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2018-01-12 01:46:45 -0600 |
| commit | b63686ce6ae96a6fca915d82b918f38b23c4a399 (patch) | |
| tree | a2191dd53cf63b74ddd0f18b4e9ccc3b16e5be31 /app/views | |
| parent | ab28ea071ba7f70e59e8aeba9da03031dd83b0f1 (diff) | |
| download | gitlab-ce-b63686ce6ae96a6fca915d82b918f38b23c4a399.tar.gz | |
Generalize protected branch/tag dropdownsce-backport-generalize-protected-branch-tags-to-create-item-dropdown
Remove duplicate ee code
This was generalized for usage in the new variable table design, see
https://gitlab.com/gitlab-org/gitlab-ce/issues/39118#note_53615249
Conflicts:
app/assets/stylesheets/pages/projects.scss
ee/app/assets/javascripts/protected_branches/protected_branch_create.js
ee/app/assets/javascripts/protected_tags/protected_tag_create.js
ee/app/views/projects/protected_branches/ee/_dropdown.html.haml
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/protected_branches/shared/_dropdown.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/protected_tags/shared/_dropdown.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/protected_branches/shared/_dropdown.html.haml b/app/views/projects/protected_branches/shared/_dropdown.html.haml index 6e9c473494e..74435236808 100644 --- a/app/views/projects/protected_branches/shared/_dropdown.html.haml +++ b/app/views/projects/protected_branches/shared/_dropdown.html.haml @@ -10,6 +10,6 @@ %ul.dropdown-footer-list %li - %button{ class: "create-new-protected-branch-button js-create-new-protected-branch", title: "New Protected Branch" } + %button{ class: "dropdown-create-new-item-button js-dropdown-create-new-item", title: "New Protected Branch" } Create wildcard %code diff --git a/app/views/projects/protected_tags/shared/_dropdown.html.haml b/app/views/projects/protected_tags/shared/_dropdown.html.haml index 9b6923210f7..f0d7dcccd36 100644 --- a/app/views/projects/protected_tags/shared/_dropdown.html.haml +++ b/app/views/projects/protected_tags/shared/_dropdown.html.haml @@ -10,6 +10,6 @@ %ul.dropdown-footer-list %li - %button{ class: "create-new-protected-tag-button js-create-new-protected-tag", title: "New Protected Tag" } + %button{ class: "dropdown-create-new-item-button js-dropdown-create-new-item", title: "New Protected Tag" } Create wildcard %code |