Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
		
							parent
							
								
									312d3ac259
								
							
						
					
					
						commit
						a4d8014b00
					
				| 
						 | 
				
			
			@ -20,7 +20,7 @@ export default {
 | 
			
		|||
<template>
 | 
			
		||||
  <timeline-entry-item class="system-note note-wrapper">
 | 
			
		||||
    <div
 | 
			
		||||
      class="gl--flex-center gl-rounded-full gl-mt-n1 gl-ml-2 gl-w-6 gl-h-6 gl-bg-gray-50 gl-text-gray-600"
 | 
			
		||||
      class="gl--flex-center gl-rounded-full gl-mt-n1 gl-ml-2 gl-w-6 gl-h-6 gl-bg-gray-50 gl-text-gray-600 gl-float-left"
 | 
			
		||||
    >
 | 
			
		||||
      <gl-icon :name="icon" />
 | 
			
		||||
    </div>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -8,7 +8,7 @@ exports[`History Item renders the correct markup 1`] = `
 | 
			
		|||
    class="timeline-entry-inner"
 | 
			
		||||
  >
 | 
			
		||||
    <div
 | 
			
		||||
      class="gl--flex-center gl-rounded-full gl-mt-n1 gl-ml-2 gl-w-6 gl-h-6 gl-bg-gray-50 gl-text-gray-600"
 | 
			
		||||
      class="gl--flex-center gl-rounded-full gl-mt-n1 gl-ml-2 gl-w-6 gl-h-6 gl-bg-gray-50 gl-text-gray-600 gl-float-left"
 | 
			
		||||
    >
 | 
			
		||||
      <gl-icon-stub
 | 
			
		||||
        name="pencil"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue