summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-11-09 16:03:47 +0100
committerJames Lopez <james@jameslopez.es>2016-11-17 08:22:58 +0100
commit848ea241db74ffc160e61c23775e336c207e65af (patch)
tree466a01cbeac059ad766617732c16c0bb5a2cc86c
parent3d00503368c355a4a9a45cda0e6673580074d2da (diff)
downloadgitlab-ce-848ea241db74ffc160e61c23775e336c207e65af.tar.gz
fix MySQL problem with query
-rw-r--r--lib/gitlab/cycle_analytics/events_query.rb2
-rw-r--r--lib/gitlab/light_url_builder.rb2
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