diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-03-28 18:12:20 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-03-28 18:12:20 +0000 |
| commit | 160d29b869673a8f2a3e57cf509e30b93e82a014 (patch) | |
| tree | 867ce1a2ba2d446b5ffd86af4a107c4e777c9e4b /app | |
| parent | c61634659bf81940a9bde740163f19bf094eab04 (diff) | |
| parent | d5f0d89f9d48dc14fbc3091547d6ff257a868586 (diff) | |
| download | gitlab-ce-160d29b869673a8f2a3e57cf509e30b93e82a014.tar.gz | |
Merge branch '44752-remove-ee-specific-comments' into 'master'
Remove EE-specific comment markers from CE
Closes #44752
See merge request gitlab-org/gitlab-ce!18054
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/ci/variables/_variable_row.html.haml | 2 | ||||
| -rw-r--r-- | app/views/import/github/new.html.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/new.html.haml | 8 | ||||
| -rw-r--r-- | app/views/shared/_import_form.html.haml | 3 |
4 files changed, 0 insertions, 16 deletions
diff --git a/app/views/ci/variables/_variable_row.html.haml b/app/views/ci/variables/_variable_row.html.haml index 5d4229c80af..440623b34f5 100644 --- a/app/views/ci/variables/_variable_row.html.haml +++ b/app/views/ci/variables/_variable_row.html.haml @@ -43,7 +43,5 @@ %span.toggle-icon = sprite_icon('status_success_borderless', size: 16, css_class: 'toggle-icon-svg toggle-status-checked') = sprite_icon('status_failed_borderless', size: 16, css_class: 'toggle-icon-svg toggle-status-unchecked') - -# EE-specific start - -# EE-specific end %button.js-row-remove-button.ci-variable-row-remove-button{ type: 'button', 'aria-label': s_('CiVariables|Remove variable row') } = icon('minus-circle') diff --git a/app/views/import/github/new.html.haml b/app/views/import/github/new.html.haml index 54ef51b30e3..c63cf2b31cb 100644 --- a/app/views/import/github/new.html.haml +++ b/app/views/import/github/new.html.haml @@ -22,9 +22,6 @@ = text_field_tag :personal_access_token, '', class: 'form-control', placeholder: _('Personal Access Token'), size: 40 = submit_tag _('List your GitHub repositories'), class: 'btn btn-success' - -# EE-specific start - -# EE-specific end - - unless github_import_configured? %hr %p diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index 8cdb0a6aff4..b66e0559603 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -18,8 +18,6 @@ = _('A project is where you house your files (repository), plan your work (issues), and publish your documentation (wiki), %{among_other_things_link}.').html_safe % { among_other_things_link: among_other_things_link } %p = _('All features are enabled for blank projects, from templates, or when importing, but you can disable them afterward in the project settings.') - -# EE-specific start - -# EE-specific end .md = brand_new_project_guidelines %p @@ -43,8 +41,6 @@ %a{ href: '#import-project-pane', id: 'import-project-tab', data: { toggle: 'tab' }, role: 'tab' } %span.hidden-xs Import project %span.visible-xs Import - -# EE-specific start - -# EE-specific end .tab-content.gitlab-tab-content .tab-pane{ id: 'blank-project-pane', class: active_when(active_tab == 'blank'), role: 'tabpanel' } @@ -110,10 +106,6 @@ = render "shared/import_form", f: f = render 'new_project_fields', f: f, project_name_id: "import-url-name" - - -# EE-specific start - -# EE-specific end - .save-project-loader.hide .center %h2 diff --git a/app/views/shared/_import_form.html.haml b/app/views/shared/_import_form.html.haml index 5eaaa1448d5..3806ead6c87 100644 --- a/app/views/shared/_import_form.html.haml +++ b/app/views/shared/_import_form.html.haml @@ -17,6 +17,3 @@ = import_will_timeout_message(ci_cd_only) %li = import_svn_message(ci_cd_only) - --# EE-specific start --# EE-specific end |