Merge branch 'release/8.0' into dev

pull/6734/head
Jens Ulferts 6 years ago
commit d620d8caa3
No known key found for this signature in database
GPG Key ID: 3CAA4B1182CF5308
  1. 1
      app/assets/stylesheets/layout/_toolbar.sass
  2. 2
      frontend/src/app/components/wp-query-select/wp-query-selectable-title.html
  3. 4
      lib/tasks/parallel_testing.rake

@ -51,7 +51,6 @@ $nm-color-success-background: #d8fdd1
.toolbar-container
padding: 0
margin-bottom: 12px
min-height: 50px
> .subtitle
font-size: rem-calc(14px)

@ -25,5 +25,5 @@
<h2 *ngIf="!editable"
[attr.title]="selectedTitle"
[ngClass]="{ '-disabled': disabled }"
class="ellipsis wp-query-selectable-title--fixed"> {{ selectedTitle | slice:0:50 }}
class="wp-query-selectable-title--fixed"> {{ selectedTitle | slice:0:50 }}
</h2>

@ -114,7 +114,7 @@ namespace :parallel do
desc 'Run plugin unit specs in parallel'
task units: [:environment] do
pattern = "--pattern '^spec/(?!features\/)'"
pattern = "--pattern 'spec/(?!features\/)'"
spec_folders = Plugins::LoadPathHelper.spec_load_paths.join(' ')
@ -127,7 +127,7 @@ namespace :parallel do
desc 'Run plugin feature specs in parallel'
task features: [:environment] do
pattern = "--pattern '^spec\/features\/'"
pattern = "--pattern 'spec\/features'"
spec_folders = Plugins::LoadPathHelper.spec_load_paths.join(' ')

Loading…
Cancel
Save