Merge branch 'new-project-ce-to-ee-port' into 'master'

Ports style changes fixed in a conflict in ce to ee upstream to master for new projects page

See merge request !2637

app/views/shared/_import_form.html.haml

 .form-group.import-url-data
   = f.label :import_url, class: 'control-label' do
     %span Git repository URL
-  .col-sm-10
-    = f.text_field :import_url, autocomplete: 'off', class: 'form-control', placeholder: 'https://username:password@gitlab.company.com/group/project.git'
 
-    .well.prepend-top-20
-      %ul
-        %li
-          The repository must be accessible over <code>http://</code>, <code>https://</code> or <code>git://</code>.
-        %li
-          If your HTTP repository is not publicly accessible, add authentication information to the URL: <code>https://username:password@gitlab.company.com/group/project.git</code>.
-        %li
-          The import will time out after 15 minutes. For repositories that take longer, use a clone/push combination.
-        %li
-          To migrate an SVN repository, check out #{link_to "this document", help_page_path('workflow/importing/migrating_from_svn')}.
-        %li
-          The Git LFS objects will <strong>not</strong> be imported.
-        %li
-          Once imported, repositories can be mirrored over SSH. Read more
-          = link_to 'here', help_page_path('/workflow/repository_mirroring.md', anchor: 'ssh-authentication')
+  = f.text_field :import_url, autocomplete: 'off', class: 'form-control', placeholder: 'https://username:password@gitlab.company.com/group/project.git'
+
+  .well.prepend-top-20
+    %ul
+      %li
+        The repository must be accessible over <code>http://</code>, <code>https://</code> or <code>git://</code>.
+      %li
+        If your HTTP repository is not publicly accessible, add authentication information to the URL: <code>https://username:password@gitlab.company.com/group/project.git</code>.
+      %li
+        The import will time out after 15 minutes. For repositories that take longer, use a clone/push combination.
+      %li
+        To migrate an SVN repository, check out #{link_to "this document", help_page_path('workflow/importing/migrating_from_svn')}.
+      %li
+        The Git LFS objects will <strong>not</strong> be imported.
+      %li
+        Once imported, repositories can be mirrored over SSH. Read more
+        = link_to 'here', help_page_path('/workflow/repository_mirroring.md', anchor: 'ssh-authentication')
 
 .form-group
-  .col-sm-offset-2.col-sm-10
-    .checkbox
-      = f.label :mirror do
-        = f.check_box :mirror, disabled: true
-        %strong
-          Mirror repository
-      .help-block
-        Automatically update this project's branches and tags from the upstream
-        repository every hour. The Git LFS objects will not be synced.
+  = f.label :mirror, class: 'control-label' do
+    = f.check_box :mirror, disabled: true
+    %strong
+      Mirror repository
+  .help-block
+    Automatically update this project's branches and tags from the upstream
+    repository every hour. The Git LFS objects will not be synced.
 
 = f.hidden_field :mirror_user_id, value: current_user.id

changelogs/unreleased-ee/new-project-ce-to-ee-port.yml

+---
+title: Ports style changes fixed in a conflict in ce to ee upstream to master for
+  new projects page
+merge_request:
+author: