summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-03-02 22:33:29 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-03-02 22:33:29 +0200
commit2d162ff9ac129f9c327db3cbd982d9a2c06f4a68 (patch)
tree34747afbf35da046d41065449e245f7ec8bfe7f6 /app
parent770f18ac50f1603b6f81794acb30065ab077f80f (diff)
downloadgitlab-ce-2d162ff9ac129f9c327db3cbd982d9a2c06f4a68.tar.gz
Fix for mysql database cause key is a reserved word
Diffstat (limited to 'app')
-rw-r--r--app/models/key.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/key.rb b/app/models/key.rb
index 779d985d98b..4367354c348 100644
--- a/app/models/key.rb
+++ b/app/models/key.rb
@@ -24,7 +24,7 @@ class Key < ActiveRecord::Base
end
def unique_key
- query = Key.where('key = ?', key)
+ query = Key.where('`key` = ?', key)
query = query.where('(project_id IS NULL OR project_id = ?)', project_id) if project_id
if (query.count > 0)
errors.add :key, 'already exist.'