From 848ea241db74ffc160e61c23775e336c207e65af Mon Sep 17 00:00:00 2001 From: James Lopez Date: Wed, 9 Nov 2016 16:03:47 +0100 Subject: [PATCH] fix MySQL problem with query --- lib/gitlab/cycle_analytics/events_query.rb | 2 +- lib/gitlab/light_url_builder.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/gitlab/cycle_analytics/events_query.rb b/lib/gitlab/cycle_analytics/events_query.rb index 7a27e099be3..9d69e267d8d 100644 --- a/lib/gitlab/cycle_analytics/events_query.rb +++ b/lib/gitlab/cycle_analytics/events_query.rb @@ -14,7 +14,7 @@ module Gitlab @config = QueryConfig.get(stage) query = build_query(&block) - ActiveRecord::Base.connection.execute(query.to_sql).to_a + ActiveRecord::Base.connection.exec_query(query.to_sql) end private diff --git a/lib/gitlab/light_url_builder.rb b/lib/gitlab/light_url_builder.rb index ceb8715ad2b..e4517b5610b 100644 --- a/lib/gitlab/light_url_builder.rb +++ b/lib/gitlab/light_url_builder.rb @@ -19,7 +19,7 @@ module Gitlab def url url_method = "#{@entity}_url" - raise NotImplementedError.new("No Light URL builder defined for #{@entity.to_s}") unless respond_to?(url_method) + raise NotImplementedError.new("No Light URL builder defined for #{@entity}") unless respond_to?(url_method) public_send(url_method) end