diff options
| -rw-r--r-- | app/assets/javascripts/api.js.coffee | 6 | ||||
| -rw-r--r-- | app/models/group.rb | 2 | ||||
| -rw-r--r-- | app/models/merge_request.rb | 1 | ||||
| -rw-r--r-- | app/models/namespace.rb | 2 | ||||
| -rw-r--r-- | app/models/note.rb | 1 | ||||
| -rw-r--r-- | app/models/pivotaltracker_service.rb | 3 | ||||
| -rw-r--r-- | spec/models/group_spec.rb | 2 | ||||
| -rw-r--r-- | spec/models/merge_request_spec.rb | 1 | ||||
| -rw-r--r-- | spec/models/namespace_spec.rb | 2 | ||||
| -rw-r--r-- | 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 db80e7b0f3c..a36d944cbcb 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 0cc3a3a0f41..d6272ca46f5 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 7f367588b23..a26190015b2 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 6ac94c06604..fde06649c78 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 e819a5516b5..7e7387abed6 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 f28e142da77..c5b1b9ab8d3 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 ce1aa05bcd7..4a08ad3bb15 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 18c32d4fb74..703f46adba3 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 0a0509bcd27..c38554e2f77 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 ef143debcc1..42c405d8e50 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' |