Merge remote-tracking branch 'origin/master' into ce-6983-promote-starting-a-gitlab-com-trial

6 files changed, 12 insertions, 9 deletions

diff --git a/app/views/import/fogbugz/new.html.haml b/app/views/import/fogbugz/new.html.haml
index b54b1af1e0c..626080c284b 100644
--- a/app/views/import/fogbugz/new.html.haml
+++ b/app/views/import/fogbugz/new.html.haml
@@ -21,4 +21,4 @@
     .col-md-4
       = password_field_tag :password, nil, class: 'form-control'
   .form-actions
-    = submit_tag _('Continue to the next step'), class: 'btn btn-create'
+    = submit_tag _('Continue to the next step'), class: 'btn btn-success'
diff --git a/app/views/import/fogbugz/new_user_map.html.haml b/app/views/import/fogbugz/new_user_map.html.haml
index ff2f989c509..8ed9dc68bb3 100644
--- a/app/views/import/fogbugz/new_user_map.html.haml
+++ b/app/views/import/fogbugz/new_user_map.html.haml
@@ -39,4 +39,4 @@
                 scope: :all, email_user: true, selected: user[:gitlab_user])
 
   .form-actions
-    = submit_tag _('Continue to the next step'), class: 'btn btn-create'
+    = submit_tag _('Continue to the next step'), class: 'btn btn-success'
diff --git a/app/views/import/gitea/new.html.haml b/app/views/import/gitea/new.html.haml
index 2b3102f9af9..a88b04eccbb 100644
--- a/app/views/import/gitea/new.html.haml
+++ b/app/views/import/gitea/new.html.haml
@@ -19,4 +19,4 @@
     .col-sm-4
       = text_field_tag :personal_access_token, nil, class: 'form-control'
   .form-actions
-    = submit_tag _('List Your Gitea Repositories'), class: 'btn btn-create'
+    = submit_tag _('List Your Gitea Repositories'), class: 'btn btn-success'
diff --git a/app/views/import/gitlab_projects/new.html.haml b/app/views/import/gitlab_projects/new.html.haml
index 4225ee19217..877d945a09b 100644
--- a/app/views/import/gitlab_projects/new.html.haml
+++ b/app/views/import/gitlab_projects/new.html.haml
@@ -8,8 +8,11 @@
 
 = form_tag import_gitlab_project_path, class: 'new_project', multipart: true do
   .row
+    .form-group.project-name.col-sm-12
+      = label_tag :name, _('Project name'), class: 'label-bold'
+      = text_field_tag :name, @name, placeholder: "My awesome project", class: "js-project-name form-control input-lg", autofocus: true, required: true
     .form-group.col-12.col-sm-6
-      = label_tag :namespace_id, 'Project path', class: 'label-bold'
+      = label_tag :namespace_id, _('Project URL'), class: 'label-bold'
       .form-group
         .input-group
           - if current_user.can_select_namespace?
@@ -24,8 +27,8 @@
                 #{user_url(current_user.username)}/
             = hidden_field_tag :namespace_id, value: current_user.namespace_id
     .form-group.col-12.col-sm-6.project-path
-      = label_tag :path, _('Project name'), class: 'label-bold'
-      = text_field_tag :path, @path, placeholder: "my-awesome-project", class: "js-path-name form-control", tabindex: 2, autofocus: true, required: true
+      = label_tag :path, _('Project slug'), class: 'label-bold'
+      = text_field_tag :path, @path, placeholder: "my-awesome-project", class: "js-path-name form-control", tabindex: 2, required: true
 
   .row
     .form-group.col-md-12
@@ -38,5 +41,5 @@
         = file_field_tag :file, class: ''
   .row
     .form-actions.col-sm-12
-      = submit_tag _('Import project'), class: 'btn btn-create'
+      = submit_tag _('Import project'), class: 'btn btn-success'
       = link_to _('Cancel'), new_project_path, class: 'btn btn-cancel'
diff --git a/app/views/import/google_code/new.html.haml b/app/views/import/google_code/new.html.haml
index fd6e4726fc5..7a6ad28f0aa 100644
--- a/app/views/import/google_code/new.html.haml
+++ b/app/views/import/google_code/new.html.haml
@@ -59,4 +59,4 @@
           = _('Yes, let me map Google Code users to full names or GitLab users.')
     %li
       %p
-        = submit_tag _('Continue to the next step'), class: "btn btn-create"
+        = submit_tag _('Continue to the next step'), class: "btn btn-success"
diff --git a/app/views/import/google_code/new_user_map.html.haml b/app/views/import/google_code/new_user_map.html.haml
index baaaf6bdc63..f523b993aa7 100644
--- a/app/views/import/google_code/new_user_map.html.haml
+++ b/app/views/import/google_code/new_user_map.html.haml
@@ -33,4 +33,4 @@
       = text_area_tag :user_map, JSON.pretty_generate(@user_map), class: 'form-control', rows: 15
 
   .form-actions
-    = submit_tag _('Continue to the next step'), class: "btn btn-create"
+    = submit_tag _('Continue to the next step'), class: "btn btn-success"