Commit 160d29b8 authored by Rémy Coutable's avatar Rémy Coutable

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
parents c6163465 d5f0d89f
...@@ -43,7 +43,5 @@ ...@@ -43,7 +43,5 @@
%span.toggle-icon %span.toggle-icon
= sprite_icon('status_success_borderless', size: 16, css_class: 'toggle-icon-svg toggle-status-checked') = 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') = 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') } %button.js-row-remove-button.ci-variable-row-remove-button{ type: 'button', 'aria-label': s_('CiVariables|Remove variable row') }
= icon('minus-circle') = icon('minus-circle')
...@@ -22,9 +22,6 @@ ...@@ -22,9 +22,6 @@
= text_field_tag :personal_access_token, '', class: 'form-control', placeholder: _('Personal Access Token'), size: 40 = 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' = submit_tag _('List your GitHub repositories'), class: 'btn btn-success'
-# EE-specific start
-# EE-specific end
- unless github_import_configured? - unless github_import_configured?
%hr %hr
%p %p
......
...@@ -18,8 +18,6 @@ ...@@ -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 } = _('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 %p
= _('All features are enabled for blank projects, from templates, or when importing, but you can disable them afterward in the project settings.') = _('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 .md
= brand_new_project_guidelines = brand_new_project_guidelines
%p %p
...@@ -43,8 +41,6 @@ ...@@ -43,8 +41,6 @@
%a{ href: '#import-project-pane', id: 'import-project-tab', data: { toggle: 'tab' }, role: 'tab' } %a{ href: '#import-project-pane', id: 'import-project-tab', data: { toggle: 'tab' }, role: 'tab' }
%span.hidden-xs Import project %span.hidden-xs Import project
%span.visible-xs Import %span.visible-xs Import
-# EE-specific start
-# EE-specific end
.tab-content.gitlab-tab-content .tab-content.gitlab-tab-content
.tab-pane{ id: 'blank-project-pane', class: active_when(active_tab == 'blank'), role: 'tabpanel' } .tab-pane{ id: 'blank-project-pane', class: active_when(active_tab == 'blank'), role: 'tabpanel' }
...@@ -110,10 +106,6 @@ ...@@ -110,10 +106,6 @@
= render "shared/import_form", f: f = render "shared/import_form", f: f
= render 'new_project_fields', f: f, project_name_id: "import-url-name" = render 'new_project_fields', f: f, project_name_id: "import-url-name"
-# EE-specific start
-# EE-specific end
.save-project-loader.hide .save-project-loader.hide
.center .center
%h2 %h2
......
...@@ -17,6 +17,3 @@ ...@@ -17,6 +17,3 @@
= import_will_timeout_message(ci_cd_only) = import_will_timeout_message(ci_cd_only)
%li %li
= import_svn_message(ci_cd_only) = import_svn_message(ci_cd_only)
-# EE-specific start
-# EE-specific end
...@@ -33,6 +33,26 @@ rest of the code should be as close to the CE files as possible. ...@@ -33,6 +33,26 @@ rest of the code should be as close to the CE files as possible.
[single code base]: https://gitlab.com/gitlab-org/gitlab-ee/issues/2952#note_41016454 [single code base]: https://gitlab.com/gitlab-org/gitlab-ee/issues/2952#note_41016454
### EE-specific comments
When complete separation can't be achieved with the `ee/` directory, you can wrap
code in EE specific comments to designate the difference from CE/EE and add
some context for someone resolving a conflict.
```rb
# EE-specific start
stub_licensed_features(variable_environment_scope: true)
# EE specific end
```
```haml
-# EE-specific start
= render 'ci/variables/environment_scope', form_field: form_field, variable: variable
-# EE-specific end
```
EE-specific comments should not be backported to CE.
### Detection of EE-only files ### Detection of EE-only files
For each commit (except on `master`), the `ee-files-location-check` CI job tries For each commit (except on `master`), the `ee-files-location-check` CI job tries
...@@ -654,12 +674,13 @@ to avoid conflicts during CE to EE merge. ...@@ -654,12 +674,13 @@ to avoid conflicts during CE to EE merge.
} }
} }
/* EE-specific styles */ // EE-specific start
.section-body.ee-section-body { .section-body.ee-section-body {
.section-title { .section-title {
background: $gl-header-color-cyan; background: $gl-header-color-cyan;
} }
} }
// EE-specific end
``` ```
## gitlab-svgs ## gitlab-svgs
......
...@@ -17,8 +17,6 @@ describe 'Projects (JavaScript fixtures)', type: :controller do ...@@ -17,8 +17,6 @@ describe 'Projects (JavaScript fixtures)', type: :controller do
end end
before do before do
# EE-specific start
# EE specific end
project.add_master(admin) project.add_master(admin)
sign_in(admin) sign_in(admin)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment