From e219cf7246c6a0495e4507deaffeba11e79f13b8 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 1 Oct 2013 15:15:28 +0300
Subject: [PATCH] Annotate!
---
app/assets/javascripts/api.js.coffee | 6 +++---
app/models/group.rb | 2 +-
app/models/merge_request.rb | 1 +
app/models/namespace.rb | 2 +-
app/models/note.rb | 1 +
app/models/pivotaltracker_service.rb | 3 +++
spec/models/group_spec.rb | 2 +-
spec/models/merge_request_spec.rb | 1 +
spec/models/namespace_spec.rb | 2 +-
spec/models/note_spec.rb | 1 +
10 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/app/assets/javascripts/api.js.coffee b/app/assets/javascripts/api.js.coffee
index db80e7b0f3..a36d944cbc 100644
--- a/app/assets/javascripts/api.js.coffee
+++ b/app/assets/javascripts/api.js.coffee
@@ -3,12 +3,12 @@
user_path: "/api/:version/users/:id.json"
notes_path: "/api/:version/projects/:id/notes.json"
- # Get 20 (depends on api) recent notes
+ # Get 20 (depends on api) recent notes
# and sort the ascending from oldest to newest
notes: (project_id, callback) ->
url = Api.buildUrl(Api.notes_path)
url = url.replace(':id', project_id)
-
+
$.ajax(
url: url,
data:
@@ -37,7 +37,7 @@
# Only active users retrieved
users: (query, callback) ->
url = Api.buildUrl(Api.users_path)
-
+
$.ajax(
url: url
data:
diff --git a/app/models/group.rb b/app/models/group.rb
index 0cc3a3a0f4..d6272ca46f 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -5,7 +5,7 @@
# id :integer not null, primary key
# name :string(255) not null
# path :string(255) not null
-# owner_id :integer not null
+# owner_id :integer
# created_at :datetime not null
# updated_at :datetime not null
# type :string(255)
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 7f367588b2..a26190015b 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -18,6 +18,7 @@
# merge_status :string(255)
# target_project_id :integer not null
# iid :integer
+# description :text
#
require Rails.root.join("app/models/commit")
diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index 6ac94c0660..fde06649c7 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -5,7 +5,7 @@
# id :integer not null, primary key
# name :string(255) not null
# path :string(255) not null
-# owner_id :integer not null
+# owner_id :integer
# created_at :datetime not null
# updated_at :datetime not null
# type :string(255)
diff --git a/app/models/note.rb b/app/models/note.rb
index e819a5516b..7e7387abed 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -14,6 +14,7 @@
# commit_id :string(255)
# noteable_id :integer
# st_diff :text
+# system :boolean default(FALSE), not null
#
require 'carrierwave/orm/activerecord'
diff --git a/app/models/pivotaltracker_service.rb b/app/models/pivotaltracker_service.rb
index f28e142da7..c5b1b9ab8d 100644
--- a/app/models/pivotaltracker_service.rb
+++ b/app/models/pivotaltracker_service.rb
@@ -10,6 +10,9 @@
# created_at :datetime not null
# updated_at :datetime not null
# active :boolean default(FALSE), not null
+# project_url :string(255)
+# subdomain :string(255)
+# room :string(255)
#
class PivotaltrackerService < Service
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index ce1aa05bcd..4a08ad3bb1 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -5,7 +5,7 @@
# id :integer not null, primary key
# name :string(255) not null
# path :string(255) not null
-# owner_id :integer not null
+# owner_id :integer
# created_at :datetime not null
# updated_at :datetime not null
# type :string(255)
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 18c32d4fb7..703f46adba 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -18,6 +18,7 @@
# merge_status :string(255)
# target_project_id :integer not null
# iid :integer
+# description :text
#
require 'spec_helper'
diff --git a/spec/models/namespace_spec.rb b/spec/models/namespace_spec.rb
index 0a0509bcd2..c38554e2f7 100644
--- a/spec/models/namespace_spec.rb
+++ b/spec/models/namespace_spec.rb
@@ -5,7 +5,7 @@
# id :integer not null, primary key
# name :string(255) not null
# path :string(255) not null
-# owner_id :integer not null
+# owner_id :integer
# created_at :datetime not null
# updated_at :datetime not null
# type :string(255)
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index ef143debcc..42c405d8e5 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -14,6 +14,7 @@
# commit_id :string(255)
# noteable_id :integer
# st_diff :text
+# system :boolean default(FALSE), not null
#
require 'spec_helper'
--
2.30.9