Download as
Browse Code »

Commit e219cf7246c6a0495e4507deaffeba11e79f13b8

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

Annotate!

Showing 10 changed files with 14 additions and 7 deletions   Show diff stats
app/assets/javascripts/api.js.coffee
  Diff comments   View file @e219cf7
... ... @@ -3,12 +3,12 @@
3 3 user_path: "/api/:version/users/:id.json"
4 4 notes_path: "/api/:version/projects/:id/notes.json"
5 5  
6   - # Get 20 (depends on api) recent notes
  6 + # Get 20 (depends on api) recent notes
7 7 # and sort the ascending from oldest to newest
8 8 notes: (project_id, callback) ->
9 9 url = Api.buildUrl(Api.notes_path)
10 10 url = url.replace(':id', project_id)
11   -
  11 +
12 12 $.ajax(
13 13 url: url,
14 14 data:
... ... @@ -37,7 +37,7 @@
37 37 # Only active users retrieved
38 38 users: (query, callback) ->
39 39 url = Api.buildUrl(Api.users_path)
40   -
  40 +
41 41 $.ajax(
42 42 url: url
43 43 data:
... ...
app/models/group.rb
  Diff comments   View file @e219cf7
... ... @@ -5,7 +5,7 @@
5 5 # id :integer not null, primary key
6 6 # name :string(255) not null
7 7 # path :string(255) not null
8   -# owner_id :integer not null
  8 +# owner_id :integer
9 9 # created_at :datetime not null
10 10 # updated_at :datetime not null
11 11 # type :string(255)
... ...
app/models/merge_request.rb
  Diff comments   View file @e219cf7
... ... @@ -18,6 +18,7 @@
18 18 # merge_status :string(255)
19 19 # target_project_id :integer not null
20 20 # iid :integer
  21 +# description :text
21 22 #
22 23  
23 24 require Rails.root.join("app/models/commit")
... ...
app/models/namespace.rb
  Diff comments   View file @e219cf7
... ... @@ -5,7 +5,7 @@
5 5 # id :integer not null, primary key
6 6 # name :string(255) not null
7 7 # path :string(255) not null
8   -# owner_id :integer not null
  8 +# owner_id :integer
9 9 # created_at :datetime not null
10 10 # updated_at :datetime not null
11 11 # type :string(255)
... ...
app/models/note.rb
  Diff comments   View file @e219cf7
... ... @@ -14,6 +14,7 @@
14 14 # commit_id :string(255)
15 15 # noteable_id :integer
16 16 # st_diff :text
  17 +# system :boolean default(FALSE), not null
17 18 #
18 19  
19 20 require 'carrierwave/orm/activerecord'
... ...
app/models/pivotaltracker_service.rb
  Diff comments   View file @e219cf7
... ... @@ -10,6 +10,9 @@
10 10 # created_at :datetime not null
11 11 # updated_at :datetime not null
12 12 # active :boolean default(FALSE), not null
  13 +# project_url :string(255)
  14 +# subdomain :string(255)
  15 +# room :string(255)
13 16 #
14 17  
15 18 class PivotaltrackerService < Service
... ...
spec/models/group_spec.rb
  Diff comments   View file @e219cf7
... ... @@ -5,7 +5,7 @@
5 5 # id :integer not null, primary key
6 6 # name :string(255) not null
7 7 # path :string(255) not null
8   -# owner_id :integer not null
  8 +# owner_id :integer
9 9 # created_at :datetime not null
10 10 # updated_at :datetime not null
11 11 # type :string(255)
... ...
spec/models/merge_request_spec.rb
  Diff comments   View file @e219cf7
... ... @@ -18,6 +18,7 @@
18 18 # merge_status :string(255)
19 19 # target_project_id :integer not null
20 20 # iid :integer
  21 +# description :text
21 22 #
22 23  
23 24 require 'spec_helper'
... ...
spec/models/namespace_spec.rb
  Diff comments   View file @e219cf7
... ... @@ -5,7 +5,7 @@
5 5 # id :integer not null, primary key
6 6 # name :string(255) not null
7 7 # path :string(255) not null
8   -# owner_id :integer not null
  8 +# owner_id :integer
9 9 # created_at :datetime not null
10 10 # updated_at :datetime not null
11 11 # type :string(255)
... ...
spec/models/note_spec.rb
  Diff comments   View file @e219cf7
... ... @@ -14,6 +14,7 @@
14 14 # commit_id :string(255)
15 15 # noteable_id :integer
16 16 # st_diff :text
  17 +# system :boolean default(FALSE), not null
17 18 #
18 19  
19 20 require 'spec_helper'
... ...