diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-06-07 09:06:43 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-06-07 09:06:43 +0000 |
| commit | 47ec712f8fe2dfc3ea85476ac44a197f6251b5c8 (patch) | |
| tree | fe9ca765ea6e83d5b961bd7342621f6de1fb62e3 | |
| parent | a18b7e7e2b5d729a06bf109a5a0a7e42e19ecab4 (diff) | |
| parent | fefe1008748e327ef9449282075bad825e72b55a (diff) | |
| download | gitlab-ce-47ec712f8fe2dfc3ea85476ac44a197f6251b5c8.tar.gz | |
Merge branch 'issue/10088' into 'master'
added code differences from EE to CE
Closes gitlab-ee#10088
See merge request gitlab-org/gitlab-ce!29271
| -rw-r--r-- | app/assets/javascripts/pages/projects/project.js | 12 | ||||
| -rw-r--r-- | changelogs/unreleased/10088-move-code-differences-EE-to-CE.yml | 5 |
2 files changed, 17 insertions, 0 deletions
diff --git a/app/assets/javascripts/pages/projects/project.js b/app/assets/javascripts/pages/projects/project.js index b288989b252..f0d529758d5 100644 --- a/app/assets/javascripts/pages/projects/project.js +++ b/app/assets/javascripts/pages/projects/project.js @@ -39,6 +39,11 @@ export default class Project { $label.text(activeText); }); + $('#modal-geo-info').data({ + cloneUrlSecondary: $this.attr('href'), + cloneUrlPrimary: $this.data('primaryUrl') || '', + }); + if (mobileCloneField) { mobileCloneField.dataset.clipboardText = url; } else { @@ -67,6 +72,13 @@ export default class Project { .remove(); return e.preventDefault(); }); + $('.hide-shared-runner-limit-message').on('click', function(e) { + var $alert = $(this).parents('.shared-runner-quota-message'); + var scope = $alert.data('scope'); + Cookies.set('hide_shared_runner_quota_message', 'false', { path: scope }); + $alert.remove(); + e.preventDefault(); + }); $('.hide-auto-devops-implicitly-enabled-banner').on('click', function(e) { const projectId = $(this).data('project-id'); const cookieKey = `hide_auto_devops_implicitly_enabled_banner_${projectId}`; diff --git a/changelogs/unreleased/10088-move-code-differences-EE-to-CE.yml b/changelogs/unreleased/10088-move-code-differences-EE-to-CE.yml new file mode 100644 index 00000000000..1297e9712fa --- /dev/null +++ b/changelogs/unreleased/10088-move-code-differences-EE-to-CE.yml @@ -0,0 +1,5 @@ +--- +title: "Added code differnces from EE in file 'app/assets/javascripts/pages/projects/project.js' to CE" +merge_request: 29271 +author: Michel Engelen +type: other |