diff options
author | Tomer Kimia <tkimia@purdue.edu> | 2014-04-01 18:52:51 -0400 |
---|---|---|
committer | Tomer Kimia <tkimia@purdue.edu> | 2014-04-01 18:52:51 -0400 |
commit | f3125c3087ac7d47d1698b328c76620f6a5464e8 (patch) | |
tree | 0317eb2937326d889e1b23f31dba9c756e3f4703 /app/models | |
parent | aa6e8f12a24e33d88a5751cee5e93bf4a038e2ef (diff) | |
parent | e6b160bd81e51e0bd88e5c2563a06ea5f0d64620 (diff) |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/remote_username.rb | 4 | ||||
-rw-r--r-- | app/models/server_setting.rb | 2 | ||||
-rw-r--r-- | app/models/server_settings.rb | 2 | ||||
-rw-r--r-- | app/models/tournament_option.rb | 3 | ||||
-rw-r--r-- | app/models/tournament_preference.rb | 3 |
5 files changed, 9 insertions, 5 deletions
diff --git a/app/models/remote_username.rb b/app/models/remote_username.rb new file mode 100644 index 0000000..94e5063 --- /dev/null +++ b/app/models/remote_username.rb @@ -0,0 +1,4 @@ +class RemoteUsername < ActiveRecord::Base + belongs_to :game + belongs_to :user +end diff --git a/app/models/server_setting.rb b/app/models/server_setting.rb new file mode 100644 index 0000000..28ae943 --- /dev/null +++ b/app/models/server_setting.rb @@ -0,0 +1,2 @@ +class ServerSetting < ActiveRecord::Base +end diff --git a/app/models/server_settings.rb b/app/models/server_settings.rb deleted file mode 100644 index 7f49863..0000000 --- a/app/models/server_settings.rb +++ /dev/null @@ -1,2 +0,0 @@ -class ServerSettings < ActiveRecord::Base -end diff --git a/app/models/tournament_option.rb b/app/models/tournament_option.rb deleted file mode 100644 index 242a6f6..0000000 --- a/app/models/tournament_option.rb +++ /dev/null @@ -1,3 +0,0 @@ -class TournamentOption < ActiveRecord::Base - belongs_to :tournament -end diff --git a/app/models/tournament_preference.rb b/app/models/tournament_preference.rb new file mode 100644 index 0000000..1f335e3 --- /dev/null +++ b/app/models/tournament_preference.rb @@ -0,0 +1,3 @@ +class TournamentPreference < ActiveRecord::Base + belongs_to :tournament +end |