Skip to content

Commit

Permalink
Updated to Rails 3.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
miloops committed Feb 14, 2012
1 parent e6bc668 commit de91be1
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Gemfile
@@ -1,6 +1,6 @@
source "http://rubygems.org"

gem "rails", "3.1.1"
gem "rails", "3.2.1"

gem 'will_paginate'
gem "ya2yaml"
Expand Down
2 changes: 1 addition & 1 deletion app/models/tolk/locale.rb
@@ -1,6 +1,6 @@
module Tolk
class Locale < ActiveRecord::Base
set_table_name "tolk_locales"
self.table_name = "tolk_locales"

MAPPING = {
'ar' => 'Arabic',
Expand Down
2 changes: 1 addition & 1 deletion app/models/tolk/phrase.rb
@@ -1,6 +1,6 @@
module Tolk
class Phrase < ActiveRecord::Base
set_table_name "tolk_phrases"
self.table_name = "tolk_phrases"

validates_uniqueness_of :key

Expand Down
2 changes: 1 addition & 1 deletion app/models/tolk/translation.rb
@@ -1,6 +1,6 @@
module Tolk
class Translation < ActiveRecord::Base
set_table_name "tolk_translations"
self.table_name = "tolk_translations"

scope :containing_text, lambda {|query| where("tolk_translations.text LIKE ?", "%#{query}%") }

Expand Down
2 changes: 1 addition & 1 deletion test/integration/authentication_test.rb
Expand Up @@ -27,6 +27,6 @@ def teardown
protected

def encode_credentials(username, password)
"Basic #{ActiveSupport::Base64.encode64("#{username}:#{password}")}"
"Basic #{Base64.encode64("#{username}:#{password}")}"
end
end

0 comments on commit de91be1

Please sign in to comment.