removed set rails version from Gemfile. Now using most recent Rails v…

…ersion.

Updated tests to pass after updating rails version.

modified:   Gemfile
modified:   Gemfile.lock
modified:   app/models/audio_recording.rb
modified:   app/models/saved_search.rb
modified:   spec/factories/analysis_job_factory.rb
modified:   spec/factories/analysis_script_factory.rb
modified:   spec/factories/audio_recording_factory.rb
modified:   spec/factories/bookmark_factory.rb
modified:   spec/factories/permission_factory.rb
modified:   spec/factories/project_factory.rb
modified:   spec/factories/saved_search_factory.rb
modified:   spec/factories/tag_factory.rb

app/models/audio_recording.rb

@@ -13,6 +13,8 @@ class AudioRecording < ActiveRecord::Base
   belongs_to :user, :class_name => 'User', :foreign_key => :uploader_id
   has_many :analysis_items
   has_many :bookmarks
+  # this is needed to be able to set a user object, rather than the user id
+  belongs_to :uploader, class_name: 'User', foreign_key: :uploader_id
 
   # attr
   attr_accessible :bit_rate_bps, :channels, :data_length_bytes,

app/models/saved_search.rb

@@ -5,6 +5,8 @@ class SavedSearch < ActiveRecord::Base
   # relations
   has_many :progresses
   belongs_to :user, class_name: 'User', foreign_key: :owner_id
+  # this is needed to be able to set a user object, rather than the user id
+  belongs_to :owner, class_name: 'User', foreign_key: :owner_id
 
   # attr
   attr_accessible :name,