summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorshumakl <shumakl@purdue.edu>2014-04-03 12:12:04 -0400
committershumakl <shumakl@purdue.edu>2014-04-03 12:12:04 -0400
commitc0b705f1397ce442427638f92b185d630db73ec5 (patch)
tree61d0b3692fa91b41983355b3456d36d5638eada3 /app/models
parentac4a9438709356f7f270476e30b3f4e572f4bf6a (diff)
normalize to tab indent
Diffstat (limited to 'app/models')
-rw-r--r--app/models/alert.rb2
-rw-r--r--app/models/game_setting.rb2
-rw-r--r--app/models/match.rb6
-rw-r--r--app/models/pm.rb4
-rw-r--r--app/models/remote_username.rb4
-rw-r--r--app/models/score.rb4
-rw-r--r--app/models/session.rb2
-rw-r--r--app/models/team.rb6
-rw-r--r--app/models/tournament_preference.rb2
-rw-r--r--app/models/user.rb8
10 files changed, 20 insertions, 20 deletions
diff --git a/app/models/alert.rb b/app/models/alert.rb
index 343c269..0516355 100644
--- a/app/models/alert.rb
+++ b/app/models/alert.rb
@@ -1,3 +1,3 @@
class Alert < ActiveRecord::Base
- belongs_to :author
+ belongs_to :author
end
diff --git a/app/models/game_setting.rb b/app/models/game_setting.rb
index e147b15..bff8d97 100644
--- a/app/models/game_setting.rb
+++ b/app/models/game_setting.rb
@@ -1,3 +1,3 @@
class GameSetting < ActiveRecord::Base
- belongs_to :game
+ belongs_to :game
end
diff --git a/app/models/match.rb b/app/models/match.rb
index 782dce8..35deb20 100644
--- a/app/models/match.rb
+++ b/app/models/match.rb
@@ -1,8 +1,8 @@
class Match < ActiveRecord::Base
- belongs_to :tournament
+ belongs_to :tournament
- has_and_belongs_to_many :teams
+ has_and_belongs_to_many :teams
- belongs_to :winner, class_name: "Team"
+ belongs_to :winner, class_name: "Team"
end
diff --git a/app/models/pm.rb b/app/models/pm.rb
index ab5af3b..9fce2b3 100644
--- a/app/models/pm.rb
+++ b/app/models/pm.rb
@@ -1,4 +1,4 @@
class Pm < ActiveRecord::Base
- belongs_to :author
- belongs_to :recipient
+ belongs_to :author
+ belongs_to :recipient
end
diff --git a/app/models/remote_username.rb b/app/models/remote_username.rb
index 94e5063..c477f8a 100644
--- a/app/models/remote_username.rb
+++ b/app/models/remote_username.rb
@@ -1,4 +1,4 @@
class RemoteUsername < ActiveRecord::Base
- belongs_to :game
- belongs_to :user
+ belongs_to :game
+ belongs_to :user
end
diff --git a/app/models/score.rb b/app/models/score.rb
index a9b9c71..11ee9a6 100644
--- a/app/models/score.rb
+++ b/app/models/score.rb
@@ -1,4 +1,4 @@
class Score < ActiveRecord::Base
- belongs_to :user
- belongs_to :match
+ belongs_to :user
+ belongs_to :match
end
diff --git a/app/models/session.rb b/app/models/session.rb
index c66afec..a5fd26e 100644
--- a/app/models/session.rb
+++ b/app/models/session.rb
@@ -1,3 +1,3 @@
class Session < ActiveRecord::Base
- belongs_to :user
+ belongs_to :user
end
diff --git a/app/models/team.rb b/app/models/team.rb
index 2348de5..7aae7c2 100644
--- a/app/models/team.rb
+++ b/app/models/team.rb
@@ -1,5 +1,5 @@
class Team < ActiveRecord::Base
- belongs_to :match
- has_and_belongs_to_many :matches
- has_and_belongs_to_many :users
+ belongs_to :match
+ has_and_belongs_to_many :matches
+ has_and_belongs_to_many :users
end
diff --git a/app/models/tournament_preference.rb b/app/models/tournament_preference.rb
index 1f335e3..3d15061 100644
--- a/app/models/tournament_preference.rb
+++ b/app/models/tournament_preference.rb
@@ -1,3 +1,3 @@
class TournamentPreference < ActiveRecord::Base
- belongs_to :tournament
+ belongs_to :tournament
end
diff --git a/app/models/user.rb b/app/models/user.rb
index 6e439fb..85f1982 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -77,11 +77,11 @@ class User < ActiveRecord::Base
# validity
validates(:name, presence: true, length: { maximum: 50 })
validates(:email, presence: true, format: {with:
- VALID_EMAIL_REG},
- uniqueness: { case_sensitive: false })
+ VALID_EMAIL_REG},
+ uniqueness: { case_sensitive: false })
validates(:user_name, presence: true, length:{maximum: 50},
- format: {with: VALID_USER_NAME_REG },
- uniqueness: {case_sensitive: false })
+ format: {with: VALID_USER_NAME_REG },
+ uniqueness: {case_sensitive: false })
##
# Instead of adding password and password_confirmation