Merge branch 'master' into ce-to-ee-2018-04-10

README.md

@@ -22,7 +22,7 @@ The source of GitLab Enterprise Edition is [hosted on GitLab.com](https://gitlab
 
 ## Free trial
 
-You can request a free trial of GitLab Enterprise Edition [on our website](https://about.gitlab.com/free-trial/).
+You can request a free trial of GitLab Ultimate [on our website](https://about.gitlab.com/free-trial/).
 
 ## Subscriber onboarding information
 

doc/development/ux_guide/components.md

@@ -63,7 +63,7 @@ A popover can contain a header section with a different background color if that
 
 ![Popover usage](img/popover-placement-below.png)
 
-This example shows two sections, where each section includes an actionable element. The first section shows a summary of the content shown when clicking the "read more" link. With this information the user can decide to dive deeper or start their GitLab Enterprise Edition trial immediately.
+This example shows two sections, where each section includes an actionable element. The first section shows a summary of the content shown when clicking the "read more" link. With this information the user can decide to dive deeper or start their GitLab Ultimate trial immediately.
 
 ### Placement
 By default, tooltips should be placed below the referring element. However, if there isn’t enough space in the viewport or it blocks related content, the tooltip should be moved to the side or above as needed.

doc/user/admin_area/license.md

@@ -8,9 +8,9 @@ The license has the form of a base64 encoded ASCII text with a `.gitlab-license`
 extension and can be obtained when you [purchase one][pricing] or when you sign
 up for a [free trial].
 
-> **Note:** As of GitLab Enterprise Edition 9.4.0, a new EE instance without a valid license
-will only have CE features active. A trial license will activate all EE features,
-but the instance will fall back to CE only functionality after the trial expires.
+> **Note:** As of GitLab Enterprise Edition 9.4.0, a new instance without a valid license
+will only have Core features active. A trial license will activate all Ultimate features,
+but the instance will fall back to Core only functionality after the trial expires.
 
 ## Uploading your license
 

ee/app/helpers/license_helper.rb

@@ -18,7 +18,7 @@ module LicenseHelper
     return unless (is_admin && current_license.notify_admins?) || current_license.notify_users?
 
     is_trial = current_license.trial?
-    message = ["Your Enterprise Edition #{'trial ' if is_trial}license"]
+    message = ["Your #{'trial ' if is_trial}license"]
 
     message << expiration_message
 

ee/app/views/admin/licenses/_upload_trial_license.html.haml

@@ -12,7 +12,7 @@
             Your trial license was issued!
           %p.confirmation-desc.lead
             Your trial license was issued and activated. Install it
-            to enjoy GitLab Enterprise Edition Premium for 30 days.
+            to enjoy GitLab Ultimate for 30 days.
           = form_for License.new, url: admin_license_path, html: { multipart: true, class: 'form-horizontal fieldset-form' } do |f|
             = f.hidden_field :data, value: license_key
             %a#hide-license.hide-license{ href: '#hide-license' }

ee/app/views/admin/licenses/missing.html.haml

@@ -12,5 +12,5 @@
   .text-center
     = custom_icon("missing_license")
     %h4 You do not have a license.
-    %p.trial-description You can start a free trial of GitLab Enterprise Edition without any obligation or payment details.
+    %p.trial-description You can start a free trial of GitLab Ultimate without any obligation or payment details.
     = link_to 'Start free trial', new_trial_url, class: "btn btn-new btn-start-trial prepend-top-10"

ee/app/views/dashboard/projects/_blank_state_ee_trial.html.haml

@@ -3,14 +3,14 @@
     = custom_icon("ee_trial", size: 50)
   .blank-state-body
     %h3.blank-state-title
-      Unlock more features with GitLab Enterprise Edition
+      Unlock more features with GitLab Ultimate
     %p.blank-state-text
       GitLab is free to use.
       Many features for larger teams are part of
-      our paid
+      our
       = succeed "." do
-        = link_to "Enterprise Edition products", "https://about.gitlab.com/products/", target: "_blank", rel: "noopener noreferrer nofollow"
-      You can try these out for free without
+        = link_to "paid products", "https://about.gitlab.com/products/", target: "_blank", rel: "noopener noreferrer nofollow"
+      You can try Ultimate for free without
       any obligation or payment details.
     = link_to new_trial_url, class: "btn btn-new" do
       Start free trial

ee/app/views/shared/promotions/_promotion_link_project.html.haml

@@ -12,7 +12,7 @@
   - if License.current&.expired?
     = link_to (!short_form ? 'Buy GitLab Enterprise Edition' : 'Buy EE'), Gitlab::SUBSCRIPTIONS_PLANS_URL, class: 'btn btn-primary'
   - else
-    = link_to (!short_form ? 'Start GitLab Enterprise Edition trial' : 'Start GitLab EE trial'), new_trial_url, class: 'btn btn-primary'
+    = link_to (!short_form ? 'Start GitLab Ultimate trial' : 'Start GitLab Ultimate trial'), new_trial_url, class: 'btn btn-primary'
 - else
   %p
     Contact your Administrator to upgrade your license.

ee/spec/features/admin/admin_license_spec.rb

@@ -58,7 +58,7 @@ feature "License Admin" do
         visit admin_license_path
 
         page.within '.gitlab-ee-license-banner' do
-          expect(page).to have_content('Your Enterprise Edition trial license expired on')
+          expect(page).to have_content('Your trial license expired on')
           expect(page).not_to have_content('Pushing code and creation of issues and merge requests has been disabled')
         end
       end

ee/spec/features/promotion_spec.rb

@@ -39,7 +39,7 @@ describe 'Promotions', :js do
       it 'should have the start trial button' do
         sign_in(admin)
         visit edit_project_path(project)
-        expect(find('#promote_service_desk')).to have_content 'Start GitLab Enterprise Edition trial'
+        expect(find('#promote_service_desk')).to have_content 'Start GitLab Ultimate trial'
       end
     end
   end

features/steps/admin/license.rb

@@ -23,7 +23,7 @@ class Spinach::Features::AdminLicense < Spinach::FeatureSteps
   end
 
   step 'I should see a warning telling me the license has expired' do
-    expect(page).to have_content "Your Enterprise Edition license expired"
+    expect(page).to have_content "Your license expired"
   end
 
   step 'the current license blocks changes' do