Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-14

app/assets/stylesheets/pages/note_form.scss

@@ -241,7 +241,7 @@ table {
   .discussion-reply-holder {
     background-color: $white-light;
     padding: 10px 16px;
-    border-radius: 0 0 $border-radius-default $border-radius-default;
+    border-radius: 0 0 3px 3px;
 
     &.is-replying {
       padding-bottom: $gl-padding;

app/assets/stylesheets/pages/notes.scss

@@ -28,7 +28,7 @@ $note-form-margin-left: 72px;
 }
 
 .main-notes-list {
-  @include vertical-line(39px);
+  @include vertical-line(36px);
 }
 
 .notes {
@@ -499,6 +499,10 @@ $note-form-margin-left: 72px;
     @include vertical-line(52px);
   }
 
+  .notes_content {
+    background-color: $white-light;
+  }
+
   .discussion-reply-holder {
     border-top: 1px solid $border-color;
   }

doc/development/i18n/proofreader.md

@@ -41,6 +41,7 @@ are very appreciative of the work done by translators and proofreaders!
   - Nikita Grylov - [GitLab](https://gitlab.com/nixel2007), [Crowdin](https://crowdin.com/profile/nixel2007)
   - Alexy Lustin - [GitLab](https://gitlab.com/allustin), [Crowdin](https://crowdin.com/profile/lustin)
 - Spanish
+  - Pedro Garcia - [GitLab](https://gitlab.com/pedgarrod), [Crowdin](https://crowdin.com/profile/breaking_pitt)
 - Ukrainian
   - Volodymyr Sobotovych - [GitLab](https://gitlab.com/wheleph), [Crowdin](https://crowdin.com/profile/wheleph)
   - Andrew Vityuk - [GitLab](https://gitlab.com/3_1_3_u), [Crowdin](https://crowdin.com/profile/andruwa13)

qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_ssh_spec.rb

@@ -10,7 +10,7 @@ module QA
 
       let(:key_title) { "key for ssh tests #{Time.now.to_f}" }
       let(:ssh_key) do
-        Factory::Resource::SSHKey.fabricate! do |resource|
+        Resource::SSHKey.fabricate! do |resource|
           resource.title = key_title
         end
       end
@@ -38,7 +38,7 @@ module QA
 
       it 'user pushes to the repository' do
         # Create a project to push to
-        project = Factory::Resource::Project.fabricate! do |project|
+        project = Resource::Project.fabricate! do |project|
           project.name = 'git-protocol-project'
         end