Download as
Browse Code »

Commit 201d489780de36eeb8e1826bbb7d1ebd8a64959b

Authored by Dmitriy Zaporozhets
1 parent f4912e04
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Annotate 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 9 changed files with 53 additions and 2 deletions   Show diff stats
app/models/broadcast_message.rb
  Diff comments   View file @201d489
  1 +# == Schema Information
  2 +#
  3 +# Table name: broadcast_messages
  4 +#
  5 +# id :integer not null, primary key
  6 +# message :text default(""), not null
  7 +# starts_at :datetime
  8 +# ends_at :datetime
  9 +# alert_type :integer
  10 +# created_at :datetime not null
  11 +# updated_at :datetime not null
  12 +#
  13 +
1 class BroadcastMessage < ActiveRecord::Base 14 class BroadcastMessage < ActiveRecord::Base
2 attr_accessible :alert_type, :ends_at, :message, :starts_at 15 attr_accessible :alert_type, :ends_at, :message, :starts_at
3 16
app/models/flowdock_service.rb
  Diff comments   View file @201d489
@@ -11,6 +11,8 @@ @@ -11,6 +11,8 @@
11 # updated_at :datetime not null 11 # updated_at :datetime not null
12 # active :boolean default(FALSE), not null 12 # active :boolean default(FALSE), not null
13 # project_url :string(255) 13 # project_url :string(255)
  14 +# subdomain :string(255)
  15 +# room :string(255)
14 # 16 #
15 17
16 require "flowdock-git-hook" 18 require "flowdock-git-hook"
app/models/project.rb
  Diff comments   View file @201d489
@@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
9 # created_at :datetime not null 9 # created_at :datetime not null
10 # updated_at :datetime not null 10 # updated_at :datetime not null
11 # creator_id :integer 11 # creator_id :integer
12 -# default_branch :string(255)  
13 # issues_enabled :boolean default(TRUE), not null 12 # issues_enabled :boolean default(TRUE), not null
14 # wall_enabled :boolean default(TRUE), not null 13 # wall_enabled :boolean default(TRUE), not null
15 # merge_requests_enabled :boolean default(TRUE), not null 14 # merge_requests_enabled :boolean default(TRUE), not null
app/models/user.rb
  Diff comments   View file @201d489
@@ -36,6 +36,11 @@ @@ -36,6 +36,11 @@
36 # notification_level :integer default(1), not null 36 # notification_level :integer default(1), not null
37 # password_expires_at :datetime 37 # password_expires_at :datetime
38 # created_by_id :integer 38 # created_by_id :integer
  39 +# avatar :string(255)
  40 +# confirmation_token :string(255)
  41 +# confirmed_at :datetime
  42 +# confirmation_sent_at :datetime
  43 +# unconfirmed_email :string(255)
39 # 44 #
40 45
41 require 'carrierwave/orm/activerecord' 46 require 'carrierwave/orm/activerecord'
spec/factories/broadcast_messages.rb
  Diff comments   View file @201d489
  1 +# == Schema Information
  2 +#
  3 +# Table name: broadcast_messages
  4 +#
  5 +# id :integer not null, primary key
  6 +# message :text default(""), not null
  7 +# starts_at :datetime
  8 +# ends_at :datetime
  9 +# alert_type :integer
  10 +# created_at :datetime not null
  11 +# updated_at :datetime not null
  12 +#
  13 +
1 # Read about factories at https://github.com/thoughtbot/factory_girl 14 # Read about factories at https://github.com/thoughtbot/factory_girl
2 15
3 FactoryGirl.define do 16 FactoryGirl.define do
spec/models/broadcast_message_spec.rb
  Diff comments   View file @201d489
  1 +# == Schema Information
  2 +#
  3 +# Table name: broadcast_messages
  4 +#
  5 +# id :integer not null, primary key
  6 +# message :text default(""), not null
  7 +# starts_at :datetime
  8 +# ends_at :datetime
  9 +# alert_type :integer
  10 +# created_at :datetime not null
  11 +# updated_at :datetime not null
  12 +#
  13 +
1 require 'spec_helper' 14 require 'spec_helper'
2 15
3 describe BroadcastMessage do 16 describe BroadcastMessage do
spec/models/flowdock_service_spec.rb
  Diff comments   View file @201d489
@@ -11,6 +11,8 @@ @@ -11,6 +11,8 @@
11 # updated_at :datetime not null 11 # updated_at :datetime not null
12 # active :boolean default(FALSE), not null 12 # active :boolean default(FALSE), not null
13 # project_url :string(255) 13 # project_url :string(255)
  14 +# subdomain :string(255)
  15 +# room :string(255)
14 # 16 #
15 17
16 require 'spec_helper' 18 require 'spec_helper'
spec/models/project_spec.rb
  Diff comments   View file @201d489
@@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
9 # created_at :datetime not null 9 # created_at :datetime not null
10 # updated_at :datetime not null 10 # updated_at :datetime not null
11 # creator_id :integer 11 # creator_id :integer
12 -# default_branch :string(255)  
13 # issues_enabled :boolean default(TRUE), not null 12 # issues_enabled :boolean default(TRUE), not null
14 # wall_enabled :boolean default(TRUE), not null 13 # wall_enabled :boolean default(TRUE), not null
15 # merge_requests_enabled :boolean default(TRUE), not null 14 # merge_requests_enabled :boolean default(TRUE), not null
spec/models/user_spec.rb
  Diff comments   View file @201d489
@@ -36,6 +36,11 @@ @@ -36,6 +36,11 @@
36 # notification_level :integer default(1), not null 36 # notification_level :integer default(1), not null
37 # password_expires_at :datetime 37 # password_expires_at :datetime
38 # created_by_id :integer 38 # created_by_id :integer
  39 +# avatar :string(255)
  40 +# confirmation_token :string(255)
  41 +# confirmed_at :datetime
  42 +# confirmation_sent_at :datetime
  43 +# unconfirmed_email :string(255)
39 # 44 #
40 45
41 require 'spec_helper' 46 require 'spec_helper'