Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: Taivara/Giffriends
base: 9ece098546
...
head fork: Taivara/Giffriends
compare: 79dd358efc
Checking mergeability… Don't worry, you can still create the pull request.
  • 3 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
View
5 app/models/match.rb
@@ -1,3 +1,8 @@
class Match < ActiveRecord::Base
attr_accessible :match_id, :user_id, :interested
+
+ belongs_to :user
+ has_one :complement, :class_name => Match,
+ :foreign_key => :match_id,
+
end
View
6 db/migrate/20130302193303_additional_fields_to_user.rb
@@ -1,8 +1,14 @@
class AdditionalFieldsToUser < ActiveRecord::Migration
+def up
change_table :users do |t|
t.integer :age
t.date :birthday
end
+end
+def down
+ remove_column :users, :age
+ remove_column :users, :birthday
+end
end
View
2  db/migrate/20130302195610_create_matches.rb
@@ -3,7 +3,7 @@ def change
create_table :matches do |t|
t.references :user
t.integer :match_id
- t.boolean :interested
+ t.integer :interested
t.timestamps
end
View
3  test/factories/matches.rb
@@ -3,7 +3,6 @@
FactoryGirl.define do
factory :match do
user
- match_id 1
- interested true
+ interested 1
end
end

No commit comments for this range

Something went wrong with that request. Please try again.