From 902baa2e1c68eca33cc832fe334fd149e3880ee4 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 28 Jan 2016 11:41:58 +0100
Subject: [PATCH 1/2] trick rubocop and temporarily add ruby 2.1 images for any
 branch

---
 .gitlab-ci.yml                                | 10 ++++++----
 app/helpers/commits_helper.rb                 |  2 +-
 app/helpers/projects_helper.rb                |  2 +-
 spec/models/concerns/case_sensitivity_spec.rb | 12 ++++++------
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dbdbae9d787..99d81a6db50 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -145,8 +145,9 @@ spec:ruby21:
   tags:
     - ruby
     - mysql
-  only:
-  - master
+# TODO: put this back after testing
+#  only:
+#  - master
 
 spinach:ruby21:
   image: ruby:2.1
@@ -155,5 +156,6 @@ spinach:ruby21:
   tags:
     - ruby
     - mysql
-  only:
-  - master
+# TODO: put this back after testing
+#  only:
+#  - master
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index 53f8f913b33..1d14ee52cfc 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -152,7 +152,7 @@ module CommitsHelper
 
     options = {
       class: "commit-#{options[:source]}-link has_tooltip",
-      data: { 'original-title': sanitize(source_email) }
+      data: { 'original-title'.to_sym => sanitize(source_email) }
     }
 
     if user.nil?
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index c5823e50096..f343d81a92a 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -40,7 +40,7 @@ module ProjectsHelper
       link_to(author_html, user_path(author), class: "author_link").html_safe
     else
       title = opts[:title].sub(":name", sanitize(author.name))
-      link_to(author_html, user_path(author), class: "author_link has_tooltip", data: { 'original-title': title, container: 'body' } ).html_safe
+      link_to(author_html, user_path(author), class: "author_link has_tooltip", data: { 'original-title'.to_sym => title, container: 'body' } ).html_safe
     end
   end
 
diff --git a/spec/models/concerns/case_sensitivity_spec.rb b/spec/models/concerns/case_sensitivity_spec.rb
index 6535246bf2d..92fdc5cd65d 100644
--- a/spec/models/concerns/case_sensitivity_spec.rb
+++ b/spec/models/concerns/case_sensitivity_spec.rb
@@ -37,7 +37,7 @@ describe CaseSensitivity, models: true do
             with(%q{LOWER("foo"."bar") = LOWER(:value)}, value: 'bar').
             and_return(criteria)
 
-          expect(model.iwhere('foo.bar': 'bar')).to eq(criteria)
+          expect(model.iwhere('foo.bar'.to_sym => 'bar')).to eq(criteria)
         end
       end
 
@@ -87,8 +87,8 @@ describe CaseSensitivity, models: true do
             with(%q{LOWER("foo"."baz") = LOWER(:value)}, value: 'baz').
             and_return(final)
 
-          got = model.iwhere('foo.bar': 'bar',
-                             'foo.baz': 'baz')
+          got = model.iwhere('foo.bar'.to_sym => 'bar',
+                             'foo.baz'.to_sym => 'baz')
 
           expect(got).to eq(final)
         end
@@ -127,7 +127,7 @@ describe CaseSensitivity, models: true do
             with(%q{`foo`.`bar` = :value}, value: 'bar').
             and_return(criteria)
 
-          expect(model.iwhere('foo.bar': 'bar')).
+          expect(model.iwhere('foo.bar'.to_sym => 'bar')).
             to eq(criteria)
         end
       end
@@ -178,8 +178,8 @@ describe CaseSensitivity, models: true do
             with(%q{`foo`.`baz` = :value}, value: 'baz').
             and_return(final)
 
-          got = model.iwhere('foo.bar': 'bar',
-                             'foo.baz': 'baz')
+          got = model.iwhere('foo.bar'.to_sym => 'bar',
+                             'foo.baz'.to_sym => 'baz')
 
           expect(got).to eq(final)
         end

From 6e4d36b49d7fc9c41e136f234c6b5dd74a86df50 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 28 Jan 2016 21:54:45 +0100
Subject: [PATCH 2/2] add back master only for ruby 2.1 images

---
 .gitlab-ci.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 99d81a6db50..dbdbae9d787 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -145,9 +145,8 @@ spec:ruby21:
   tags:
     - ruby
     - mysql
-# TODO: put this back after testing
-#  only:
-#  - master
+  only:
+  - master
 
 spinach:ruby21:
   image: ruby:2.1
@@ -156,6 +155,5 @@ spinach:ruby21:
   tags:
     - ruby
     - mysql
-# TODO: put this back after testing
-#  only:
-#  - master
+  only:
+  - master