Merge remote-tracking branch 'origin/master' into downcase-registry-repository

3 files changed, 28 insertions, 4 deletions

diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 4f8a8748d3f..8046e203a99 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -41,7 +41,7 @@
       margin: 0;
       margin-left: 20px;
       padding: 5px;
-      padding-top: 12px;
+      padding-top: 8px;
       line-height: 20px;
 
       &.right {
@@ -110,6 +110,29 @@
     p:last-child {
       margin-bottom: 0;
     }
+
+    @media (max-width: $screen-sm-max) {
+      h4 {
+        font-size: 15px;
+      }
+
+      p {
+        font-size: 13px;
+      }
+
+      .btn,
+      .btn-group,
+      .accept-action {
+        width: 100%;
+        margin-bottom: 4px;
+      }
+
+      .accept-control {
+        width: 100%;
+        text-align: center;
+        margin: 0;
+      }
+    }
   }
 
   .mr-widget-footer {
diff --git a/spec/models/commit_range_spec.rb b/spec/models/commit_range_spec.rb
index 6bc496414a3..384a38ebc69 100644
--- a/spec/models/commit_range_spec.rb
+++ b/spec/models/commit_range_spec.rb
@@ -151,9 +151,10 @@ describe CommitRange, models: true do
       issue = create(:issue)
 
       create(:note_on_issue,
-             noteable_id: issue.id,
+             noteable: issue,
              system: true,
-             note: commit1.revert_description)
+             note: commit1.revert_description,
+             project: issue.project)
 
       expect_any_instance_of(Commit).to receive(:reverts_commit?).
         with(commit1).
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index b25150f7055..e9d89c9a847 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -154,7 +154,7 @@ describe Note, models: true do
     context "confidential issues" do
       let(:user) { create :user }
       let(:confidential_issue) { create(:issue, :confidential, author: user) }
-      let(:confidential_note) { create :note, note: "Random", noteable: confidential_issue }
+      let(:confidential_note) { create :note, note: "Random", noteable: confidential_issue, project: confidential_issue.project }
 
       it "returns notes with matching content if user can see the issue" do
         expect(described_class.search(confidential_note.note, as_user: user)).to eq([confidential_note])