Automatic merge of gitlab-org/gitlab-ce master

app/assets/javascripts/pipelines/components/header_component.vue

@@ -2,6 +2,7 @@
 import { GlLoadingIcon } from '@gitlab/ui';
 import ciHeader from '../../vue_shared/components/header_ci_component.vue';
 import eventHub from '../event_hub';
+import { __ } from '~/locale';
 
 export default {
   name: 'PipelineHeaderSection',
@@ -54,7 +55,7 @@ export default {
 
       if (this.pipeline.retry_path) {
         actions.push({
-          label: 'Retry',
+          label: __('Retry'),
           path: this.pipeline.retry_path,
           cssClass: 'js-retry-button btn btn-inverted-secondary',
           type: 'button',
@@ -64,7 +65,7 @@ export default {
 
       if (this.pipeline.cancel_path) {
         actions.push({
-          label: 'Cancel running',
+          label: __('Cancel running'),
           path: this.pipeline.cancel_path,
           cssClass: 'js-btn-cancel-pipeline btn btn-danger',
           type: 'button',

app/assets/javascripts/pipelines/components/pipeline_url.vue

@@ -94,9 +94,8 @@ export default {
         tabindex="0"
         class="js-pipeline-url-autodevops badge badge-info autodevops-badge"
         role="button"
+        >{{ __('Auto DevOps') }}</gl-link
       >
-        Auto DevOps
-      </gl-link>
       <span v-if="pipeline.flags.stuck" class="js-pipeline-url-stuck badge badge-warning">
         {{ __('stuck') }}
       </span>

locale/gitlab.pot

@@ -2424,6 +2424,9 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
+msgid "Cancel running"
+msgstr ""
+
 msgid "Cancel this job"
 msgstr ""
 

spec/tasks/migrate/schema_check_rake_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'rake'
 
-describe 'schema_version_check rake task', :quarantine do
+describe 'schema_version_check rake task' do
   include StubENV
 
   before :all do
@@ -15,8 +15,6 @@ describe 'schema_version_check rake task', :quarantine do
   end
 
   before do
-    # Stub out db tasks
-    allow(ActiveRecord::Tasks::DatabaseTasks).to receive(:migrate).and_return(true)
     allow(ActiveRecord::Migrator).to receive(:current_version).and_return(Gitlab::Database::MIN_SCHEMA_VERSION)
 
     # Ensure our check can re-run each time
@@ -24,23 +22,23 @@ describe 'schema_version_check rake task', :quarantine do
   end
 
   it 'allows migrations on databases meeting the min schema version requirement' do
-    expect { run_rake_task('db:migrate') }.not_to raise_error
+    expect { run_rake_task('schema_version_check') }.not_to raise_error
   end
 
   it 'raises an error when schema version is too old to migrate' do
     allow(ActiveRecord::Migrator).to receive(:current_version).and_return(25)
-    expect { run_rake_task('db:migrate') }.to raise_error(RuntimeError, /current database version is too old to be migrated/)
+    expect { run_rake_task('schema_version_check') }.to raise_error(RuntimeError, /current database version is too old to be migrated/)
   end
 
   it 'skips running validation when passed the skip env variable' do
     stub_env('SKIP_SCHEMA_VERSION_CHECK', 'true')
     allow(ActiveRecord::Migrator).to receive(:current_version).and_return(25)
-    expect { run_rake_task('db:migrate') }.not_to raise_error
+    expect { run_rake_task('schema_version_check') }.not_to raise_error
   end
 
   it 'allows migrations on fresh databases' do
     allow(ActiveRecord::Migrator).to receive(:current_version).and_return(0)
-    expect { run_rake_task('db:migrate') }.not_to raise_error
+    expect { run_rake_task('schema_version_check') }.not_to raise_error
   end
 
   def run_rake_task(task_name)