From 76cd67b0052ddf68ece6edef174755d0e3b4aa8a Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Tue, 2 Aug 2016 13:23:55 +0100
Subject: [PATCH] Make SCSS lint and RuboCop happy
---
app/assets/stylesheets/pages/merge_conflicts.scss | 6 +++---
app/controllers/projects/merge_requests_controller.rb | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/assets/stylesheets/pages/merge_conflicts.scss b/app/assets/stylesheets/pages/merge_conflicts.scss
index fe81ce2eb67..a0309113054 100644
--- a/app/assets/stylesheets/pages/merge_conflicts.scss
+++ b/app/assets/stylesheets/pages/merge_conflicts.scss
@@ -8,7 +8,7 @@ $origin_gutter: #e0f0ff;
$selected_origin_gutter: #a3d3ff;
$selected_origin_line: #cee4f9;
-$unselected_gutter: #eeeeee;
+$unselected_gutter: #eee;
$unselected_line: #f8f8f8;
@@ -93,8 +93,8 @@ $unselected_line: #f8f8f8;
button {
border-radius: 4px;
- border: 1px solid #E1E1E1;
- background: #FFF;
+ border: 1px solid #e1e1e1;
+ background: #fff;
font-size: 10px;
position: absolute;
right: 20px;
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 2f934729432..abea9ced624 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -140,7 +140,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
format.json do
begin
render json: Gitlab::Conflict::FileCollection.new(@merge_request)
- rescue Gitlab::Conflict::Parser::ParserError, Gitlab::Conflict::FileCollection::ConflictSideMissing => e
+ rescue Gitlab::Conflict::Parser::ParserError, Gitlab::Conflict::FileCollection::ConflictSideMissing
render json: {
message: 'Unable to resolve conflicts in the web interface for this merge request',
type: 'error'
--
GitLab